Merge branch 'develop' into merging

Conflicts: src/bootldr/fileops.h src/bootldr/iap.c src/fpga_spi.c src/memory.c src/smc.c verilog/sd2snes/address.v
Menu: rename menu labels to "filesel", minor tweaks/fixes
2014-01-16 22:16:51 +00:00 · 2013-10-18 15:35:41 +02:00 · 2013-10-18 15:32:42 +02:00 · 2013-10-18 15:31:25 +02:00 · 2013-10-18 15:30:08 +02:00 · 2013-10-18 14:43:02 +02:00
108 changed files with 13953 additions and 20551 deletions
--- a/snes/Makefile
+++ b/snes/Makefile
@ -1,4 +1,4 @@
-OBJS = header.ips reset.o65 main.o65 font.o65 palette.o65 data.o65 const.o65 logo.o65 logospr.o65 text.o65 dma.o65 menu.o65 pad.o65 time.o65 mainmenu.o65 sysinfo.o65 spc700.o65 spcplay.o65 # gfx.o65 # vars.o65
+OBJS = header.ips reset.o65 main.o65 font.o65 palette.o65 data.o65 const.o65 logo.o65 logospr.o65 text.o65 dma.o65 filesel.o65 pad.o65 time.o65 mainmenu.o65 sysinfo.o65 spc700.o65 spcplay.o65 # gfx.o65 # vars.o65

 all: clean menu.bin map

--- a/snes/data.a65
+++ b/snes/data.a65
@ -45,9 +45,9 @@ bar_x		.byt 0	; pixel x position of select bar
 bar_y		.byt 0	; pixel y position of select bar
 bar_w		.byt 0	; bar width
 bar_wl		.byt 0	; bar width
-menu_state	.byt 0	; menu state (0=file select)
-menu_dirty	.byt 0	; menu dirty (e.g. after state change or when redraw is needed)
-menu_sel	.word 0 ; selected item #
+filesel_state	.byt 0	; menu state (0=file select)
+filesel_dirty	.byt 0	; menu dirty (e.g. after state change or when redraw is needed)
+filesel_sel	.word 0 ; selected item #
 cursor_x	.byt 0	; current cursor position (x)
 cursor_y	.byt 0  ; current cursor position (y)
 fd_addr		.word 0	; address of current "file descriptor"
@ -96,6 +96,8 @@ barstep		.byt 0  ; step size for bar

 ;-misc
 testvar		.word 0,0,0,0
+;menu system
+menu_stack	.word 0,0,0,0,0,0,0,0
 ;----------hdma tables in WRAM (must be stable when cartridge is cut off)
 hdma_pal	.byt 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 		.byt 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
--- a/snes/filesel.a65
+++ b/snes/filesel.a65
@ -1,7 +1,7 @@
 #include "memmap.i65"
 #include "dma.i65"

-menu_init:
+filesel_init:
 	sep #$20 : .as
 	rep #$10 : .xl
 	lda #^ROOT_DIR
@ -10,7 +10,7 @@ menu_init:
 	stx dirptr_addr
 	sta dirstart_bank
 	stx dirstart_addr
-	stz menu_state
+	stz filesel_state
 	stz dirend_onscreen
 	lda #$02
 	sta cursor_x
@ -22,11 +22,11 @@ menu_init:
 	sta bar_wl
 	ldx #$0000
 	stx dirptr_idx
-	stx menu_sel
+	stx filesel_sel
 	stx direntry_xscroll
 	stx direntry_xscroll_state
 	lda #$01
-	sta menu_dirty
+	sta filesel_dirty
 	rep #$20 : .al
 	lda #!dirlog
 	sta dirlog_idx
@ -35,39 +35,39 @@ menu_init:
 	sta dirlog_idx+2
 	rts

-menuloop:
-menuloop_s1
+fileselloop:
+fileselloop_s1
 	sep #$20 : .as
 	rep #$10 : .xl
 	lda isr_done
 	lsr
-	bcc menuloop_s1
+	bcc fileselloop_s1
 	stz isr_done
 	jsr printtime
-	jsr menu_updates	;update stuff, check keys etc
-	lda menu_dirty		;is there ANY reason to redraw the menu?
+	jsr filesel_updates	;update stuff, check keys etc
+	lda filesel_dirty		;is there ANY reason to redraw the menu?
 	cmp #$01
-	beq menuloop_redraw 	;then do
+	beq fileselloop_redraw 	;then do
 	jsr scroll_direntry
-	bra menuloop_s1
-menuloop_redraw
-	stz menu_dirty
-	jsr menu_statusbar
-	jsr menu_redraw
-	jsr menu_cleanup	;update phase 2
-	bra menuloop_s1
+	bra fileselloop_s1
+fileselloop_redraw
+	stz filesel_dirty
+	jsr filesel_statusbar
+	jsr filesel_redraw
+	jsr filesel_cleanup	;update phase 2
+	bra fileselloop_s1
 	rts

-menu_cleanup:
+filesel_cleanup:
 	sep #$20 : .as
 	rep #$10 : .xl
 	lda dirend_onscreen     ;end of file list on screen?
-	beq menu_cleanup_out    ;
+	beq filesel_cleanup_out    ;
 	lda dirend_idx
 	lsr
 	lsr
 	pha
-menu_cleanup_loop               ;pad rest of screen with empty lines
+filesel_cleanup_loop               ;pad rest of screen with empty lines
 	cmp listdisp            ;end of screen reached?
 	beq +                   ;then leave
 	pha
@ -86,24 +86,24 @@ menu_cleanup_loop               ;pad rest of screen with empty lines
 	jsr hiprint
 	pla
 	inc
-	bra menu_cleanup_loop
+	bra filesel_cleanup_loop
 +
 	pla
-	cmp menu_sel
-	beq menu_cleanup_out
-	bpl menu_cleanup_out
-	sta menu_sel
-menu_cleanup_out
+	cmp filesel_sel
+	beq filesel_cleanup_out
+	bpl filesel_cleanup_out
+	sta filesel_sel
+filesel_cleanup_out
 	rts


-menu_updates:
+filesel_updates:
 ;update selection, scroll etc
-	lda menu_sel
+	lda filesel_sel
 	asl
 	asl
 	sta dirptr_idx
-	lda menu_sel
+	lda filesel_sel
 	clc
 	adc #$08
 	sta bar_yl
@ -140,47 +140,47 @@ menu_updates:
 	lda #$40
 	and pad1trig
 	bne key_x
-	bra menuupd_out
+	bra fileselupd_out
 key_down
-	jsr menu_key_down
-	bra menuupd_out
+	jsr filesel_key_down
+	bra fileselupd_out
 key_up
-	jsr menu_key_up
-	bra menuupd_out
+	jsr filesel_key_up
+	bra fileselupd_out
 key_right
-	jsr menu_key_right
-	bra menuupd_out
+	jsr filesel_key_right
+	bra fileselupd_out
 key_left
-	jsr menu_key_left
-	bra menuupd_out
+	jsr filesel_key_left
+	bra fileselupd_out
 key_b
-	jsr menu_key_b
-	bra menuupd_out
+	jsr filesel_key_b
+	bra fileselupd_out
 key_a
-	jsr menu_key_a
-	bra menuupd_out
+	jsr filesel_key_a
+	bra fileselupd_out
 key_x
-	jsr menu_key_x
-	bra menuupd_out
+	jsr filesel_key_x
+	bra fileselupd_out
 key_select
-	jsr menu_key_select
-	bra menuupd_out
+	jsr filesel_key_select
+	bra fileselupd_out
 key_start
-	jsr menu_key_start
-	bra menuupd_out
+	jsr filesel_key_start
+	bra fileselupd_out

-menuupd_out
+fileselupd_out
 	lda #$09
 	sta cursor_y
 	rts


-menu_redraw:
-	lda menu_state
+filesel_redraw:
+	lda filesel_state
 	beq redraw_filelist
 ;	cmp 1
 ;	beq redraw_main
-menu_redraw_out
+filesel_redraw_out
 	rts

 redraw_filelist
@ -236,7 +236,7 @@ redraw_filelist_last	;check if next offscreen item is end of dir
 redraw_filelist_out
 	ldx #$0000
 	stx dirptr_idx
-	brl menu_redraw_out
+	brl filesel_redraw_out

 print_direntry:
        lda cursor_y
@ -355,14 +355,14 @@ dirent_type_cont_2

 	rts

-menu_key_down:
+filesel_key_down:
 	jsr scroll_direntry_clean
 	lda listdisp
 	dec
-	cmp menu_sel
+	cmp filesel_sel
 	bne down_noscroll
 	lda #$01
-	sta menu_dirty
+	sta filesel_dirty
 	lda dirend_onscreen
 	bne down_out
 	rep #$20 : .al
@ -380,21 +380,21 @@ down_noscroll
 	lda dirend_idx
 	lsr
 	lsr
-	cmp menu_sel
-	beq menuupd_lastcursor
-	bcc menuupd_lastcursor
-+	lda menu_sel
+	cmp filesel_sel
+	beq fileselupd_lastcursor
+	bcc fileselupd_lastcursor
+	lda filesel_sel
 	inc
-	sta menu_sel
+	sta filesel_sel
 down_out
 	rts

-menu_key_up:
+filesel_key_up:
 	jsr scroll_direntry_clean
-	lda menu_sel
+	lda filesel_sel
 	bne up_noscroll
 	lda #$01
-	sta menu_dirty
+	sta filesel_dirty
 	rep #$20 : .al
 	lda dirptr_addr
 	cmp dirstart_addr
@ -407,25 +407,25 @@ menu_key_up:
 	bra up_out
 up_noscroll
 	dec
-	sta menu_sel
+	sta filesel_sel
 up_out
 	sep #$20 : .as
 	rts

-menuupd_lastcursor
+fileselupd_lastcursor
 	jsr scroll_direntry_clean
 	lda dirend_idx
 	lsr
 	lsr
-	sta menu_sel
+	sta filesel_sel
 	rts

 ; go back one page
-menu_key_left:
+filesel_key_left:
 	stz direntry_xscroll
 	stz direntry_xscroll_state
 	lda #$01            ; must redraw afterwards
-	sta menu_dirty
+	sta filesel_dirty
 	rep #$20 : .al
 	lda dirptr_addr     ; get current direntry pointer
 	beq +               ; special case: if 0, we are at the first entry in memory
@ -444,18 +444,18 @@ menu_key_left:
 	sep #$20 : .as
 	rts
 +	lda dirstart_addr   ; reset pointer to start of directory
-	stz menu_sel        ; reset the selection cursor too
+	stz filesel_sel        ; reset the selection cursor too
 	bra -

 ; go forth one page
-menu_key_right:
+filesel_key_right:
 	stz direntry_xscroll
 	stz direntry_xscroll_state
 	sep #$20 : .as
 	lda dirend_onscreen
-	bne menuupd_lastcursor
+	bne fileselupd_lastcursor
 	lda #$01
-	sta menu_dirty
+	sta filesel_dirty
 	rep #$20 : .al
 	lda listdisp
 	asl
@ -466,18 +466,18 @@ menu_key_right:
 	sep #$20 : .as
 	rts

-menu_key_a:
+filesel_key_a:
 	jsr select_item
 	rts

-menu_key_select:
+filesel_key_select:
 	rts

-menu_key_start:
+filesel_key_start:
 	jsr select_last_file
 	rts

-menu_key_b:
+filesel_key_b:
 	stz direntry_xscroll
 	stz direntry_xscroll_state
 	rep #$20 : .al
@ -485,7 +485,7 @@ menu_key_b:
 	beq skip_key_b
 	sta dirptr_addr
 	lda #$0000
-	sta menu_sel
+	sta filesel_sel
 	bra select_item
 skip_key_b
 	sep #$20 : .as
@ -493,7 +493,7 @@ skip_key_b

 select_item:
 	rep #$20 : .al
-	lda menu_sel
+	lda filesel_sel
 	and #$00ff
 	asl
 	asl
@ -568,7 +568,7 @@ select_dir:
 	lda @dirptr_bank
 	sta [dirlog_idx], y
 	iny
-	lda @menu_sel
+	lda @filesel_sel
 	sta [dirlog_idx], y
 	lda @dirlog_idx
 	clc
@ -604,12 +604,12 @@ select_dir:
 	sta @dirptr_addr
 	sta @dirstart_addr
 	lda #$0000
-	sta @menu_sel
+	sta @filesel_sel
 	sta @direntry_xscroll
 	sta @direntry_xscroll_state
 	sep #$20 : .as
 	lda #$01
-	sta @menu_dirty
+	sta @filesel_dirty
 	plb
 	rts

@ -638,11 +638,11 @@ select_parent:
 	sta @dirptr_bank
 	iny
 	rep #$20 : .al
-	lda [dirlog_idx], y ; load menu_sel
-	sta @menu_sel
+	lda [dirlog_idx], y ; load filesel_sel
+	sta @filesel_sel
 	sep #$20 : .as
 	lda #$01
-	sta @menu_dirty
+	sta @filesel_dirty
 	rts

 select_spc:
@ -666,7 +666,7 @@ wait_spc:
 	jsr restore_screen
 	rts

-menu_key_x:
+filesel_key_x:
 	jsr mainmenu
 	rts

@ -676,11 +676,11 @@ setup_224:
 	lda #18
 	sta listdisp
 	dec
-	cmp menu_sel
+	cmp filesel_sel
 	bmi setup_224_adjsel
 	bra +
 setup_224_adjsel
-	sta menu_sel
+	sta filesel_sel
 +
 	lda #18*64
 	sta textdmasize
@ -699,7 +699,7 @@ setup_224_adjsel
 	sta hdma_math_selection
 	stz vidmode
 	lda #$01
-	sta menu_dirty
+	sta filesel_dirty
 	lda #^space64
 	ldx #!space64
 	sta print_bank
@ -719,7 +719,7 @@ setup_224_adjsel
 	plp
 	rts

-menu_statusbar
+filesel_statusbar
 	pha
 	phx
 	php
@ -822,7 +822,7 @@ scroll_direntry_clean:
 	rts

 scroll_direntry:
-	ldy menu_sel
+	ldy filesel_sel
 	lda direntry_xscroll_state
 	bne +
 	lda direntry_fits, y
@ -852,7 +852,7 @@ scroll_direntry_scrollfast
 	lda #$02
 	sta cursor_x
 	rep #$20 : .al
-	lda menu_sel
+	lda filesel_sel
 	asl
 	asl
 	tay
@ -869,7 +869,7 @@ scroll_direntry_scrollfast
 	lda [dirptr_addr], y
 	iny
 	sta @dirent_type
-	ldy menu_sel
+	ldy filesel_sel
 	sty direntry_fits_idx
 	phy
 	jsr print_direntry
--- a/snes/main.a65
+++ b/snes/main.a65
@ -21,15 +21,15 @@ GAME_MAIN:
 	tcs
 	sep #$20 : .as

-	jsr killdma		; The following initialization processes must not touch memory
-	jsr waitblank		; structures used by the main menu !
+;	jsr killdma		; The following initialization processes must not touch memory
+	jsr waitblank		; structures used by the file selector !
 	jsr snes_init
 	cli
 	lda #$01
 	sta $420d 		; fast cpu
 	jsr setup_gfx
 	jsr colortest
-	jsr tests
+	jsr video_init
 	jsr setup_hdma
 	lda #$0f
 	sta cur_bright
@ -43,15 +43,15 @@ set_bank:

 coldboot:							; Regular, cold-start init
 	sep #$20 : .as
-	jsr killdma
+;	jsr killdma
 	jsr waitblank
 	jsr snes_init
 	lda #$01
 	sta $420d ; fast cpu
 	jsr setup_gfx
 	jsr colortest
-	jsr menu_init
-	jsr tests
+	jsr filesel_init
+	jsr video_init
 	jsr setup_hdma
 	jsr screen_on

@ -60,7 +60,7 @@ coldboot:							; Regular, cold-start init
 	beq +
 	jsl time_init
 +
-	jsr menuloop
+	jsr fileselloop
 	cli
 	stz $4200
 	jmp @infloop	;infinite loop in WRAM
@ -138,6 +138,30 @@ killdma:
 	stz $4359
 	stz $435a
 	stz $435b
+	stz $4360
+	stz $4361
+	stz $4362
+	stz $4363
+	stz $4364
+	stz $4365
+	stz $4366
+	stz $4367
+	stz $4368
+	stz $4369
+	stz $436a
+	stz $436b
+	stz $4370
+	stz $4371
+	stz $4372
+	stz $4373
+	stz $4374
+	stz $4375
+	stz $4376
+	stz $4377
+	stz $4378
+	stz $4379
+	stz $437a
+	stz $437b

 	stz $420b
 	stz $420c
@ -190,7 +214,7 @@ setup_gfx:
 ;clear OAM tables
 	ldx #$0000
 	stx $2102
-	DMA0(#$08, #$544, #^zero, #!zero, #$04)
+	DMA0(#$08, #$220, #^zero, #!zero, #$04)

 ;copy logo tiles
 	ldx #$2000
@ -273,7 +297,7 @@ setup_gfx:
 	DMA0(#$00, #$6C, #^fadeloop, #!fadeloop, #$80);
 	rts

-tests:
+video_init:
 	sep #$20 : .as		;8-bit accumulator
 	rep #$10 : .xl		;16-bit index
 	lda #$03		;mode 3, mode 5 via HDMA
--- a/snes/mainmenu.a65
+++ b/snes/mainmenu.a65
@ -80,15 +80,12 @@ mm_entloop
 	plb
 	phx
 	jsr hiprint
-	plx
-	inx
-	inx
-	inx
-	inx
-	inx
-	inx
-	inx
-	inx
+	rep #$20 : .al
+	pla
+	clc
+	adc #$08
+	tax
+	sep #$20 : .as
 	inc mm_tmp
 	lda mm_tmp
 	cmp @main_entries
--- a/src/Makefile
+++ b/src/Makefile
@ -55,7 +55,7 @@ TARGET = $(OBJDIR)/sd2snes


 # List C source files here. (C dependencies are automatically generated.)
-SRC = main.c ff.c ccsbcs.c clock.c uart.c power.c led.c timer.c printf.c spi.c fileops.c rtc.c fpga.c fpga_spi.c snes.c smc.c memory.c filetypes.c faulthandler.c sort.c crc32.c cic.c cli.c xmodem.c irq.c rle.c sdnative.c msu1.c crc16.c sysinfo.c cfg.c tests.c
+SRC = main.c ff.c ccsbcs.c clock.c uart.c power.c led.c timer.c printf.c spi.c fileops.c rtc.c fpga.c fpga_spi.c snes.c smc.c memory.c filetypes.c faulthandler.c sort.c crc32.c cic.c cli.c xmodem.c irq.c rle.c sdnative.c msu1.c crc16.c sysinfo.c cfg.c

 # usbcontrol.c usb_hid.c usbhw_lpc.c usbinit.c usbstdreq.c

@ -198,7 +198,7 @@ ALL_ASFLAGS = -I. -x assembler-with-cpp $(ASFLAGS) $(CDEFS)
 # Default target.
 all: build

-build: snesboot.h cfgware.h elf bin hex
+build: elf bin hex cfgware.h
 	$(E) "  SIZE   $(TARGET).elf"
 	$(Q)$(ELFSIZE)|grep -v debug
 	cp $(TARGET).bin $(OBJDIR)/firmware.img
@ -218,13 +218,13 @@ sym: $(TARGET).sym

 program: build
 	utils/lpcchksum $(TARGET).bin
-	openocd -f interface/olimex-arm-usb-ocd.cfg  -f lpc1754.cfg -f flash.cfg
+	openocd -f openocd-usb.cfg -f lpc1754.cfg -f flash.cfg

 debug: build
-	openocd -f interface/olimex-arm-usb-ocd.cfg  -f lpc1754.cfg
+	openocd -f openocd-usb.cfg -f lpc1754.cfg

 reset:
-	openocd -f interface/olimex-arm-usb-ocd.cfg  -f lpc1754.cfg -f reset.cfg
+	openocd -f openocd-usb.cfg -f lpc1754.cfg -f reset.cfg

 # Display size of file.
 HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex
@ -234,22 +234,11 @@ ELFSIZE = $(SIZE) -A $(TARGET).elf
 # Generate cfgware.h
 cfgware.h: $(OBJDIR)/fpga_rle.bit
 	$(E) "  BIN2H  $@"
-	$(Q) $(BIN2H) $< $@ cfgware
-
-$(OBJDIR)/fpga_rle.bit: ../verilog/sd2sneslite/main.bit
+	$(Q) $(BIN2H) $< $@
+$(OBJDIR)/fpga_rle.bit: sd2sneslite.bit
 	$(E) "  RLE    $@"
 	$(Q) $(RLE) $< $@

-#generate snesboot.h
-snesboot.h: $(OBJDIR)/snesboot.rle
-		$(E) "  BIN2H  $@"
-		$(Q) $(BIN2H) $< $@ bootrle
-
-$(OBJDIR)/snesboot.rle: ../snes/boot/menu.bin
-		$(E) "  RLE    $@"
-		$(Q) $(RLE) $< $@
-
-
 # Generate autoconf.h from config
 .PRECIOUS : $(OBJDIR)/autoconf.h
 $(OBJDIR)/autoconf.h: $(CONFIG) | $(OBJDIR)
--- a/src/README
+++ b/src/README
@ -17,6 +17,7 @@ b) Cortex M3 toolchain
    - texinfo
    - libmpfr-dev
    - libgmp3-dev
+    - libmpc-dev
    - gawk
    - bison
    - recode
--- a/src/bootldr/bits.h
+++ b/src/bootldr/bits.h
@ -4,14 +4,14 @@
 /* The classic macro */
 #define BV(x) (1<<(x))

-/* CM3 bit-bang access macro - no error checks! */
-#define BITBANG(addr,bit) \
+/* CM3 bit-band access macro - no error checks! */
+#define BITBAND(addr,bit) \
  (*((volatile unsigned long *)( \
     ((unsigned long)&(addr) & 0x01ffffff)*32 + \
      (bit)*4 + 0x02000000 + ((unsigned long)&(addr) & 0xfe000000) \
  )))

-#define BITBANG_OFF(addr,offset,bit) \
+#define BITBAND_OFF(addr,offset,bit) \
  (*((volatile unsigned long *)( \
     (((unsigned long)&(addr) + offset) & 0x01ffffff)*32 + \
      (bit)*4 + 0x02000000 + (((unsigned long)&(addr) + offset) & 0xfe000000) \
--- a/src/bootldr/ccsbcs.c
+++ b/src/bootldr/ccsbcs.c
@ -31,8 +31,7 @@
 #if _CODE_PAGE == 437
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP437(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP437(0x80-0xFF) to Unicode conversion table */
 	0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
 	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
 	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
@ -54,8 +53,7 @@ const WCHAR Tbl[] =     /*  CP437(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 720
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP720(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP720(0x80-0xFF) to Unicode conversion table */
 	0x0000, 0x0000, 0x00E9, 0x00E2, 0x0000, 0x00E0, 0x0000, 0x00E7,
 	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x0651, 0x0652, 0x00F4, 0x00A4, 0x0640, 0x00FB, 0x00F9,
@ -77,8 +75,7 @@ const WCHAR Tbl[] =     /*  CP720(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 737
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP737(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP737(0x80-0xFF) to Unicode conversion table */
 	0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398,
 	0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, 0x03A0,
 	0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9,
@ -100,8 +97,7 @@ const WCHAR Tbl[] =     /*  CP737(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 775
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP775(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP775(0x80-0xFF) to Unicode conversion table */
 	0x0106, 0x00FC, 0x00E9, 0x0101, 0x00E4, 0x0123, 0x00E5, 0x0107,
 	0x0142, 0x0113, 0x0156, 0x0157, 0x012B, 0x0179, 0x00C4, 0x00C5,
 	0x00C9, 0x00E6, 0x00C6, 0x014D, 0x00F6, 0x0122, 0x00A2, 0x015A,
@ -123,8 +119,7 @@ const WCHAR Tbl[] =     /*  CP775(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 850
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP850(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP850(0x80-0xFF) to Unicode conversion table */
 	0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
 	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
 	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
@ -146,8 +141,7 @@ const WCHAR Tbl[] =     /*  CP850(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 852
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP852(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP852(0x80-0xFF) to Unicode conversion table */
 	0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x016F, 0x0107, 0x00E7,
 	0x0142, 0x00EB, 0x0150, 0x0151, 0x00EE, 0x0179, 0x00C4, 0x0106,
 	0x00C9, 0x0139, 0x013A, 0x00F4, 0x00F6, 0x013D, 0x013E, 0x015A,
@ -169,8 +163,7 @@ const WCHAR Tbl[] =     /*  CP852(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 855
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP855(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP855(0x80-0xFF) to Unicode conversion table */
 	0x0452, 0x0402, 0x0453, 0x0403, 0x0451, 0x0401, 0x0454, 0x0404,
 	0x0455, 0x0405, 0x0456, 0x0406, 0x0457, 0x0407, 0x0458, 0x0408,
 	0x0459, 0x0409, 0x045A, 0x040A, 0x045B, 0x040B, 0x045C, 0x040C,
@ -192,8 +185,7 @@ const WCHAR Tbl[] =     /*  CP855(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 857
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP857(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP857(0x80-0xFF) to Unicode conversion table */
 	0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
 	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x0131, 0x00C4, 0x00C5,
 	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
@ -215,8 +207,7 @@ const WCHAR Tbl[] =     /*  CP857(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 858
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP858(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP858(0x80-0xFF) to Unicode conversion table */
 	0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
 	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
 	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
@ -238,8 +229,7 @@ const WCHAR Tbl[] =     /*  CP858(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 862
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP862(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP862(0x80-0xFF) to Unicode conversion table */
 	0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7,
 	0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
 	0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7,
@ -261,8 +251,7 @@ const WCHAR Tbl[] =     /*  CP862(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 866
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP866(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP866(0x80-0xFF) to Unicode conversion table */
 	0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
 	0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
 	0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
@ -284,8 +273,7 @@ const WCHAR Tbl[] =     /*  CP866(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 874
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP874(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP874(0x80-0xFF) to Unicode conversion table */
 	0x20AC, 0x0000, 0x0000, 0x0000, 0x0000, 0x2026, 0x0000, 0x0000,
 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
@ -307,8 +295,7 @@ const WCHAR Tbl[] =     /*  CP874(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 1250
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP1250(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP1250(0x80-0xFF) to Unicode conversion table */
 	0x20AC, 0x0000, 0x201A, 0x0000, 0x201E, 0x2026, 0x2020, 0x2021,
 	0x0000, 0x2030, 0x0160, 0x2039, 0x015A, 0x0164, 0x017D, 0x0179,
 	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
@ -330,8 +317,7 @@ const WCHAR Tbl[] =     /*  CP1250(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 1251
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP1251(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP1251(0x80-0xFF) to Unicode conversion table */
 	0x0402, 0x0403, 0x201A, 0x0453, 0x201E, 0x2026, 0x2020, 0x2021,
 	0x20AC, 0x2030, 0x0409, 0x2039, 0x040A, 0x040C, 0x040B, 0x040F,
 	0x0452, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
@ -353,8 +339,7 @@ const WCHAR Tbl[] =     /*  CP1251(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 1252
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP1252(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP1252(0x80-0xFF) to Unicode conversion table */
 	0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
 	0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x017D, 0x0000,
 	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
@ -376,8 +361,7 @@ const WCHAR Tbl[] =     /*  CP1252(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 1253
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP1253(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP1253(0x80-0xFF) to Unicode conversion table */
 	0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
 	0x0000, 0x2030, 0x0000, 0x2039, 0x000C, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
@ -399,8 +383,7 @@ const WCHAR Tbl[] =     /*  CP1253(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 1254
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP1254(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP1254(0x80-0xFF) to Unicode conversion table */
 	0x20AC, 0x0000, 0x210A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
 	0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
@ -422,8 +405,7 @@ const WCHAR Tbl[] =     /*  CP1254(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 1255
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP1255(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP1255(0x80-0xFF) to Unicode conversion table */
 	0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
 	0x02C6, 0x2030, 0x0000, 0x2039, 0x0000, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
@ -445,8 +427,7 @@ const WCHAR Tbl[] =     /*  CP1255(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 1256
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP1256(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP1256(0x80-0xFF) to Unicode conversion table */
 	0x20AC, 0x067E, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
 	0x02C6, 0x2030, 0x0679, 0x2039, 0x0152, 0x0686, 0x0698, 0x0688,
 	0x06AF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
@ -468,8 +449,7 @@ const WCHAR Tbl[] =     /*  CP1256(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 1257
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP1257(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP1257(0x80-0xFF) to Unicode conversion table */
 	0x20AC, 0x0000, 0x201A, 0x0000, 0x201E, 0x2026, 0x2020, 0x2021,
 	0x0000, 0x2030, 0x0000, 0x2039, 0x0000, 0x00A8, 0x02C7, 0x00B8,
 	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
@ -491,8 +471,7 @@ const WCHAR Tbl[] =     /*  CP1257(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 1258
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP1258(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP1258(0x80-0xFF) to Unicode conversion table */
 	0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
 	0x02C6, 0x2030, 0x0000, 0x2039, 0x0152, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
@ -527,29 +506,18 @@ WCHAR ff_convert (  /* Converted character, Returns zero on error */
 	WCHAR c;


-    if ( src < 0x80 )   /* ASCII */
-    {
+	if (src < 0x80) {	/* ASCII */
 		c = src;

-    }
-    else
-    {
-        if ( dir )      /* OEMCP to Unicode */
-        {
-            c = ( src >= 0x100 ) ? 0 : Tbl[src - 0x80];
+	} else {
+		if (dir) {		/* OEMCP to Unicode */
+			c = (src >= 0x100) ? 0 : Tbl[src - 0x80];

+		} else {		/* Unicode to OEMCP */
+			for (c = 0; c < 0x80; c++) {
+				if (src == Tbl[c]) break;
 			}
-        else            /* Unicode to OEMCP */
-        {
-            for ( c = 0; c < 0x80; c++ )
-            {
-                if ( src == Tbl[c] )
-                {
-                    break;
-                }
-            }
-
-            c = ( c + 0x80 ) & 0xFF;
+			c = (c + 0x80) & 0xFF;
 		}
 	}

@ -566,7 +534,7 @@ WCHAR ff_wtoupper ( /* Upper converted character */
 	int i;


-    for ( i = 0; tbl_lower[i] && chr != tbl_lower[i]; i++ ) ;
+	for (i = 0; tbl_lower[i] && chr != tbl_lower[i]; i++) ;

 	return tbl_lower[i] ? tbl_upper[i] : chr;
 }
--- a/src/bootldr/clock.c
+++ b/src/bootldr/clock.c
@ -7,19 +7,17 @@
 #include "bits.h"
 #include "uart.h"

-void clock_disconnect()
-{
+void clock_disconnect() {
  disconnectPLL0();
  disablePLL0();
 }

-void clock_init()
-{
+void clock_init() {

-    /* set flash access time to 6 clks (safe setting) */
-    setFlashAccessTime( 6 );
+/* set flash access time to 6 clks (safe setting) */
+  setFlashAccessTime(6);

-    /* setup PLL0 for ~44100*256*8 Hz
+/* setup PLL0 for ~44100*256*8 Hz
   Base clock: 12MHz
   Multiplier:  429
   Pre-Divisor:  19
@ -28,17 +26,17 @@ void clock_init()
   -> DAC freq = 44099.5 Hz
   -> FPGA freq = 11289473.7Hz
   First, disable and disconnect PLL0.
-    */
-    //  clock_disconnect();
+*/
+//  clock_disconnect();

-    /* PLL is disabled and disconnected. setup PCLK NOW as it cannot be changed
+/* PLL is disabled and disconnected. setup PCLK NOW as it cannot be changed
   reliably with PLL0 connected.
   see:
   http://ics.nxp.com/support/documents/microcontrollers/pdf/errata.lpc1754.pdf
-    */
+*/


-    /* continue with PLL0 setup:
+/* continue with PLL0 setup:
   enable the xtal oscillator and wait for it to become stable
   set the oscillator as clk source for PLL0
   set PLL0 multiplier+predivider
@ -49,74 +47,61 @@ void clock_init()
   done
 */
  enableMainOsc();
-    setClkSrc( CLKSRC_MAINOSC );
-    setPLL0MultPrediv( 12, 1 );
+  setClkSrc(CLKSRC_MAINOSC);
+  setPLL0MultPrediv(12, 1);
  enablePLL0();
-    setCCLKDiv( 3 );
+  setCCLKDiv(3);
  connectPLL0();
 }

-void setFlashAccessTime( uint8_t clocks )
-{
-    LPC_SC->FLASHCFG = FLASHTIM( clocks );
+void setFlashAccessTime(uint8_t clocks) {
+  LPC_SC->FLASHCFG=FLASHTIM(clocks);
 }

-void setPLL0MultPrediv( uint16_t mult, uint8_t prediv )
-{
-    LPC_SC->PLL0CFG = PLL_MULT( mult ) | PLL_PREDIV( prediv );
+void setPLL0MultPrediv(uint16_t mult, uint8_t prediv) {
+  LPC_SC->PLL0CFG=PLL_MULT(mult) | PLL_PREDIV(prediv);
  PLL0feed();
 }

-void enablePLL0()
-{
+void enablePLL0() {
  LPC_SC->PLL0CON |= PLLE0;
  PLL0feed();
 }

-void disablePLL0()
-{
+void disablePLL0() {
  LPC_SC->PLL0CON &= ~PLLE0;
  PLL0feed();
 }

-void connectPLL0()
-{
-    while ( !( LPC_SC->PLL0STAT & PLOCK0 ) );
-
+void connectPLL0() {
+  while(!(LPC_SC->PLL0STAT&PLOCK0));
  LPC_SC->PLL0CON |= PLLC0;
  PLL0feed();
 }

-void disconnectPLL0()
-{
+void disconnectPLL0() {
  LPC_SC->PLL0CON &= ~PLLC0;
  PLL0feed();
 }

-void setCCLKDiv( uint8_t div )
-{
-    LPC_SC->CCLKCFG = CCLK_DIV( div );
+void setCCLKDiv(uint8_t div) {
+  LPC_SC->CCLKCFG=CCLK_DIV(div);
 }

-void enableMainOsc()
-{
-    LPC_SC->SCS = OSCEN;
-
-    while ( !( LPC_SC->SCS & OSCSTAT ) );
+void enableMainOsc() {
+  LPC_SC->SCS=OSCEN;
+  while(!(LPC_SC->SCS&OSCSTAT));
 }

-void disableMainOsc()
-{
-    LPC_SC->SCS = 0;
+void disableMainOsc() {
+  LPC_SC->SCS=0;
 }

-void PLL0feed()
-{
-    LPC_SC->PLL0FEED = 0xaa;
-    LPC_SC->PLL0FEED = 0x55;
+void PLL0feed() {
+  LPC_SC->PLL0FEED=0xaa;
+  LPC_SC->PLL0FEED=0x55;
 }

-void setClkSrc( uint8_t src )
-{
-    LPC_SC->CLKSRCSEL = src;
+void setClkSrc(uint8_t src) {
+  LPC_SC->CLKSRCSEL=src;
 }
--- a/src/bootldr/clock.h
+++ b/src/bootldr/clock.h
@ -49,31 +49,31 @@
 #define PCLK_SYSCON	(28)
 #define PCLK_MC		(30)

-void clock_disconnect( void );
+void clock_disconnect(void);

-void clock_init( void );
+void clock_init(void);

-void setFlashAccessTime( uint8_t clocks );
+void setFlashAccessTime(uint8_t clocks);

-void setPLL0MultPrediv( uint16_t mult, uint8_t prediv );
+void setPLL0MultPrediv(uint16_t mult, uint8_t prediv);

-void enablePLL0( void );
+void enablePLL0(void);

-void disablePLL0( void );
+void disablePLL0(void);

-void connectPLL0( void );
+void connectPLL0(void);

-void disconnectPLL0( void );
+void disconnectPLL0(void);

-void setCCLKDiv( uint8_t div );
+void setCCLKDiv(uint8_t div);

-void enableMainOsc( void );
+void enableMainOsc(void);

-void disableMainOsc( void );
+void disableMainOsc(void);

-void PLL0feed( void );
+void PLL0feed(void);

-void setClkSrc( uint8_t src );
+void setClkSrc(uint8_t src);


 #endif
--- a/src/bootldr/conf2h.awk
+++ b/src/bootldr/conf2h.awk
@ -4,7 +4,7 @@
 # file to a C header. No copyright claimed.

 BEGIN {
-  print "// autoconf.h generated from " ARGV[1] " at NOW\n" \
+  print "// autoconf.h generated from " ARGV[1] " at " strftime() "\n" \
    "#ifndef AUTOCONF_H\n" \
    "#define AUTOCONF_H"
 }
--- a/src/bootldr/config.h
+++ b/src/bootldr/config.h
@ -27,12 +27,12 @@
 #define IN_AHBRAM                 __attribute__ ((section(".ahbram")))

 #define SD_DT_INT_SETUP()         do {\
-        BITBANG(LPC_GPIOINT->IO2IntEnR, SD_DT_BIT) = 1;\
-        BITBANG(LPC_GPIOINT->IO2IntEnF, SD_DT_BIT) = 1;\
+                                    BITBAND(LPC_GPIOINT->IO2IntEnR, SD_DT_BIT) = 1;\
+                                    BITBAND(LPC_GPIOINT->IO2IntEnF, SD_DT_BIT) = 1;\
                                  } while(0)

-#define SD_CHANGE_DETECT          (BITBANG(LPC_GPIOINT->IO2IntStatR, SD_DT_BIT)\
-                                   |BITBANG(LPC_GPIOINT->IO2IntStatF, SD_DT_BIT))
+#define SD_CHANGE_DETECT          (BITBAND(LPC_GPIOINT->IO2IntStatR, SD_DT_BIT)\
+                                   |BITBAND(LPC_GPIOINT->IO2IntStatF, SD_DT_BIT))

 #define SD_CHANGE_CLR()           do {LPC_GPIOINT->IO2IntClr = BV(SD_DT_BIT);} while(0)

@ -41,8 +41,8 @@
 #define SD_WP_REG                 LPC_GPIO0
 #define SD_WP_BIT                 6

-#define SDCARD_DETECT             (!(BITBANG(SD_DT_REG->FIOPIN, SD_DT_BIT)))
-#define SDCARD_WP                 (BITBANG(SD_WP_REG->FIOPIN, SD_WP_BIT))
+#define SDCARD_DETECT             (!(BITBAND(SD_DT_REG->FIOPIN, SD_DT_BIT)))
+#define SDCARD_WP                 (BITBAND(SD_WP_REG->FIOPIN, SD_WP_BIT))
 #define SD_SUPPLY_VOLTAGE         (1L<<21) /* 3.3V - 3.4V */
 #define CONFIG_SD_BLOCKTRANSFER   1
 #define CONFIG_SD_AUTO_RETRIES    10
--- a/src/bootldr/crc.h
+++ b/src/bootldr/crc.h
@ -1,9 +1,9 @@
 #ifndef CRC_H
 #define CRC_H

-uint8_t crc7update( uint8_t crc, uint8_t data );
-uint16_t crc_xmodem_update( uint16_t crc, uint8_t data );
-uint16_t crc_xmodem_block( uint16_t crc, const uint8_t *data, uint32_t length );
+uint8_t crc7update(uint8_t crc, uint8_t data);
+uint16_t crc_xmodem_update(uint16_t crc, uint8_t data);
+uint16_t crc_xmodem_block(uint16_t crc, const uint8_t *data, uint32_t length);

 // AVR-libc compatibility
 #define _crc_xmodem_update(crc,data) crc_xmodem_update(crc,data)
--- a/src/bootldr/crc32.c
+++ b/src/bootldr/crc32.c
@ -26,19 +26,17 @@
 * \param data_len     The width of \a data expressed in number of bits.
 * \return     The reflected data.
 ******************************************************************************/
-uint32_t crc_reflect( uint32_t data, size_t data_len )
+uint32_t crc_reflect(uint32_t data, size_t data_len)
 {
    unsigned int i;
    uint32_t ret;

    ret = data & 0x01;
-
-    for ( i = 1; i < data_len; i++ )
+    for (i = 1; i < data_len; i++)
    {
        data >>= 1;
-        ret = ( ret << 1 ) | ( data & 0x01 );
+        ret = (ret << 1) | (data & 0x01);
    }
-
    return ret;
 }

@ -51,31 +49,23 @@ uint32_t crc_reflect( uint32_t data, size_t data_len )
 * \param data_len Number of bytes in the \a data buffer.
 * \return         The updated crc value.
 *****************************************************************************/
-uint32_t crc32_update( uint32_t crc, const unsigned char data )
+uint32_t crc32_update(uint32_t crc, const unsigned char data)
 {
    unsigned int i;
    uint32_t bit;
    unsigned char c;

    c = data;
-
-    for ( i = 0x01; i & 0xff; i <<= 1 )
-    {
+    for (i = 0x01; i & 0xff; i <<= 1) {
        bit = crc & 0x80000000;
-
-        if ( c & i )
-        {
+        if (c & i) {
            bit = !bit;
        }
-
        crc <<= 1;
-
-        if ( bit )
-        {
+        if (bit) {
            crc ^= 0x04c11db7;
        }
    }
-
    return crc & 0xffffffff;
 }

--- a/src/bootldr/crc32.h
+++ b/src/bootldr/crc32.h
@ -42,14 +42,14 @@ extern "C" {
 * \param data_len     The width of \a data expressed in number of bits.
 * \return     The reflected data.
 *****************************************************************************/
-uint32_t crc_reflect( uint32_t data, size_t data_len );
+uint32_t crc_reflect(uint32_t data, size_t data_len);

 /**
 * Calculate the initial crc value.
 *
 * \return     The initial crc value.
 *****************************************************************************/
-static inline uint32_t crc_init( void )
+static inline uint32_t crc_init(void)
 {
    return 0xffffffff;
 }
@ -62,7 +62,7 @@ static inline uint32_t crc_init( void )
 * \param data_len Number of bytes in the \a data buffer.
 * \return         The updated crc value.
 *****************************************************************************/
-uint32_t crc32_update( uint32_t crc, const unsigned char data );
+uint32_t crc32_update(uint32_t crc, const unsigned char data);

 /**
 * Calculate the final crc value.
@ -70,9 +70,9 @@ uint32_t crc32_update( uint32_t crc, const unsigned char data );
 * \param crc  The current crc value.
 * \return     The final crc value.
 *****************************************************************************/
-static inline uint32_t crc_finalize( uint32_t crc )
+static inline uint32_t crc_finalize(uint32_t crc)
 {
-    return crc_reflect( crc, 32 ) ^ 0xffffffff;
+    return crc_reflect(crc, 32) ^ 0xffffffff;
 }


--- a/src/bootldr/diskio.h
+++ b/src/bootldr/diskio.h
@ -16,8 +16,7 @@
 typedef BYTE	DSTATUS;

 /* Results of Disk Functions */
-typedef enum
-{
+typedef enum {
 	RES_OK = 0,		/* 0: Successful */
 	RES_ERROR,		/* 1: R/W Error */
 	RES_WRPRT,		/* 2: Write Protected */
@ -36,8 +35,7 @@ typedef enum
 * This is the struct returned in the data buffer when disk_getinfo
 * is called with page=0.
 */
-typedef struct
-{
+typedef struct {
  uint8_t  validbytes;
  uint8_t  maxpage;
  uint8_t  disktype;
@ -50,17 +48,17 @@ typedef struct
 /*---------------------------------------*/
 /* Prototypes for disk control functions */

-int assign_drives ( int, int );
-DSTATUS disk_initialize ( BYTE );
-DSTATUS disk_status ( BYTE );
-DRESULT disk_read ( BYTE, BYTE *, DWORD, BYTE );
+int assign_drives (int, int);
+DSTATUS disk_initialize (BYTE);
+DSTATUS disk_status (BYTE);
+DRESULT disk_read (BYTE, BYTE*, DWORD, BYTE);
 #if	_READONLY == 0
-DRESULT disk_write ( BYTE, const BYTE *, DWORD, BYTE );
+DRESULT disk_write (BYTE, const BYTE*, DWORD, BYTE);
 #endif
 #define disk_ioctl(a,b,c) RES_OK
 #define get_fattime() 	(0)

-void disk_init( void );
+void disk_init(void);

 /* Will be set to DISK_ERROR if any access on the card fails */
 enum diskstates { DISK_CHANGED = 0, DISK_REMOVED, DISK_OK, DISK_ERROR };
--- a/src/bootldr/faulthandler.c
+++ b/src/bootldr/faulthandler.c
@ -2,26 +2,21 @@
 #include "config.h"
 #include "uart.h"

-void HardFault_Handler( void )
-{
-    DBG_BL printf( "HFSR: %lx\n", SCB->HFSR );
-    DBG_UART uart_putc( 'H' );
-
-    while ( 1 ) ;
+void HardFault_Handler(void) {
+  DBG_BL printf("HFSR: %lx\n", SCB->HFSR);
+  DBG_UART uart_putc('H');
+  while (1) ;
 }

-void MemManage_Handler( void )
-{
-    DBG_BL printf( "MemManage - CFSR: %lx; MMFAR: %lx\n", SCB->CFSR, SCB->MMFAR );
+void MemManage_Handler(void) {
+  DBG_BL printf("MemManage - CFSR: %lx; MMFAR: %lx\n", SCB->CFSR, SCB->MMFAR);
 }

-void BusFault_Handler( void )
-{
-    DBG_BL printf( "BusFault - CFSR: %lx; BFAR: %lx\n", SCB->CFSR, SCB->BFAR );
+void BusFault_Handler(void) {
+  DBG_BL printf("BusFault - CFSR: %lx; BFAR: %lx\n", SCB->CFSR, SCB->BFAR);
 }

-void UsageFault_Handler( void )
-{
-    DBG_BL printf( "UsageFault - CFSR: %lx; BFAR: %lx\n", SCB->CFSR, SCB->BFAR );
+void UsageFault_Handler(void) {
+  DBG_BL printf("UsageFault - CFSR: %lx; BFAR: %lx\n", SCB->CFSR, SCB->BFAR);
 }

--- a/src/bootldr/ff.c
+++ b/src/bootldr/ff.c
--- a/src/bootldr/ff.h
+++ b/src/bootldr/ff.h
@ -229,8 +229,7 @@ extern "C" {
 #if _MULTI_PARTITION		/* Multiple partition configuration */
 #define LD2PD(vol) (VolToPart[vol].pd)	/* Get physical drive# */
 #define LD2PT(vol) (VolToPart[vol].pt)	/* Get partition# */
-typedef struct
-{
+typedef struct {
 	BYTE pd;	/* Physical drive# */
 	BYTE pt;	/* Partition # (0-3) */
 } PARTITION;
@ -269,8 +268,7 @@ typedef char TCHAR;

 /* File system object structure (FATFS) */

-typedef struct
-{
+typedef struct {
 	BYTE	fs_type;		/* FAT sub-type (0:Not mounted) */
 	BYTE	drv;			/* Physical drive number */
 	BYTE	csize;			/* Sectors per cluster (1,2,4...128) */
@ -306,9 +304,8 @@ typedef struct

 /* File object structure (FIL) */

-typedef struct
-{
-    FATFS  *fs;             /* Pointer to the owner file system object */
+typedef struct {
+	FATFS*	fs;				/* Pointer to the owner file system object */
 	WORD	id;				/* Owner file system mount ID */
 	BYTE	flag;			/* File status flags */
 	BYTE	pad1;
@ -319,10 +316,10 @@ typedef struct
 	DWORD	dsect;			/* Current data sector */
 #if !_FS_READONLY
 	DWORD	dir_sect;		/* Sector containing the directory entry */
-    BYTE   *dir_ptr;        /* Ponter to the directory entry in the window */
+	BYTE*	dir_ptr;		/* Ponter to the directory entry in the window */
 #endif
 #if _USE_FASTSEEK
-    DWORD  *cltbl;          /* Pointer to the cluster link map table (null on file open) */
+	DWORD*	cltbl;			/* Pointer to the cluster link map table (null on file open) */
 #endif
 #if _FS_SHARE
 	UINT	lockid;			/* File lock ID (index of file semaphore table) */
@ -336,18 +333,17 @@ typedef struct

 /* Directory object structure (DIR) */

-typedef struct
-{
-    FATFS  *fs;             /* Pointer to the owner file system object */
+typedef struct {
+	FATFS*	fs;				/* Pointer to the owner file system object */
 	WORD	id;				/* Owner file system mount ID */
 	WORD	index;			/* Current read/write index number */
 	DWORD	sclust;			/* Table start cluster (0:Root dir) */
 	DWORD	clust;			/* Current cluster */
 	DWORD	sect;			/* Current sector */
-    BYTE   *dir;            /* Pointer to the current SFN entry in the win[] */
-    BYTE   *fn;             /* Pointer to the SFN (in/out) {file[8],ext[3],status[1]} */
+	BYTE*	dir;			/* Pointer to the current SFN entry in the win[] */
+	BYTE*	fn;				/* Pointer to the SFN (in/out) {file[8],ext[3],status[1]} */
 #if _USE_LFN
-    WCHAR  *lfn;            /* Pointer to the LFN working buffer */
+	WCHAR*	lfn;			/* Pointer to the LFN working buffer */
 	WORD	lfn_idx;		/* Last matched LFN index number (0xFFFF:No LFN) */
 #endif
 } DIR;
@ -356,8 +352,7 @@ typedef struct

 /* File status structure (FILINFO) */

-typedef struct
-{
+typedef struct {
 	DWORD	fsize;			/* File size */
 	WORD	fdate;			/* Last modified date */
 	WORD	ftime;			/* Last modified time */
@ -365,7 +360,7 @@ typedef struct
 	TCHAR	fname[13];		/* Short file name (8.3 format) */
 	DWORD	clust;			/* start cluster */
 #if _USE_LFN
-    TCHAR  *lfname;         /* Pointer to the LFN buffer */
+	TCHAR*	lfname;			/* Pointer to the LFN buffer */
 	UINT 	lfsize;			/* Size of LFN buffer in TCHAR */
 #endif
 } FILINFO;
@ -374,8 +369,7 @@ typedef struct

 /* File function return code (FRESULT) */

-typedef enum
-{
+typedef enum {
 	FR_OK = 0,				/* (0) Succeeded */
 	FR_DISK_ERR,			/* (1) A hard error occured in the low level disk I/O layer */
 	FR_INT_ERR,				/* (2) Assertion failed */
@ -403,50 +397,49 @@ typedef enum
 /* FatFs module application interface                           */

 /* Low Level functions */
-FRESULT l_openfilebycluster( FATFS *fs, FIL *fp, const TCHAR *path, DWORD clust,
-                             DWORD fsize ); /* Open a file by its start cluster using supplied file size */
+FRESULT l_openfilebycluster(FATFS *fs, FIL *fp, const TCHAR *path, DWORD clust, DWORD fsize);   /* Open a file by its start cluster using supplied file size */

 /* application level functions */
-FRESULT f_mount ( BYTE, FATFS * );                  /* Mount/Unmount a logical drive */
-FRESULT f_open ( FIL *, const TCHAR *, BYTE );      /* Open or create a file */
-FRESULT f_read ( FIL *, void *, UINT, UINT * );     /* Read data from a file */
-FRESULT f_lseek ( FIL *, DWORD );                   /* Move file pointer of a file object */
-FRESULT f_close ( FIL * );                          /* Close an open file object */
-FRESULT f_opendir ( DIR *, const TCHAR * );         /* Open an existing directory */
-FRESULT f_readdir ( DIR *, FILINFO * );             /* Read a directory item */
-FRESULT f_stat ( const TCHAR *, FILINFO * );        /* Get file status */
+FRESULT f_mount (BYTE, FATFS*);						/* Mount/Unmount a logical drive */
+FRESULT f_open (FIL*, const TCHAR*, BYTE);			/* Open or create a file */
+FRESULT f_read (FIL*, void*, UINT, UINT*);			/* Read data from a file */
+FRESULT f_lseek (FIL*, DWORD);						/* Move file pointer of a file object */
+FRESULT f_close (FIL*);								/* Close an open file object */
+FRESULT f_opendir (DIR*, const TCHAR*);				/* Open an existing directory */
+FRESULT f_readdir (DIR*, FILINFO*);					/* Read a directory item */
+FRESULT f_stat (const TCHAR*, FILINFO*);			/* Get file status */

 #if !_FS_READONLY
-FRESULT f_write ( FIL *, const void *, UINT, UINT * ); /* Write data to a file */
-FRESULT f_getfree ( const TCHAR *, DWORD *, FATFS ** ); /* Get number of free clusters on the drive */
-FRESULT f_truncate ( FIL * );                       /* Truncate file */
-FRESULT f_sync ( FIL * );                           /* Flush cached data of a writing file */
-FRESULT f_unlink ( const TCHAR * );                 /* Delete an existing file or directory */
-FRESULT f_mkdir ( const TCHAR * );                  /* Create a new directory */
-FRESULT f_chmod ( const TCHAR *, BYTE, BYTE );      /* Change attriburte of the file/dir */
-FRESULT f_utime ( const TCHAR *, const FILINFO * ); /* Change timestamp of the file/dir */
-FRESULT f_rename ( const TCHAR *, const TCHAR * );  /* Rename/Move a file or directory */
+FRESULT f_write (FIL*, const void*, UINT, UINT*);	/* Write data to a file */
+FRESULT f_getfree (const TCHAR*, DWORD*, FATFS**);	/* Get number of free clusters on the drive */
+FRESULT f_truncate (FIL*);							/* Truncate file */
+FRESULT f_sync (FIL*);								/* Flush cached data of a writing file */
+FRESULT f_unlink (const TCHAR*);					/* Delete an existing file or directory */
+FRESULT	f_mkdir (const TCHAR*);						/* Create a new directory */
+FRESULT f_chmod (const TCHAR*, BYTE, BYTE);			/* Change attriburte of the file/dir */
+FRESULT f_utime (const TCHAR*, const FILINFO*);		/* Change timestamp of the file/dir */
+FRESULT f_rename (const TCHAR*, const TCHAR*);		/* Rename/Move a file or directory */
 #endif

 #if _USE_FORWARD
-FRESULT f_forward ( FIL *, UINT( * )( const BYTE *, UINT ), UINT, UINT * ); /* Forward data to the stream */
+FRESULT f_forward (FIL*, UINT(*)(const BYTE*,UINT), UINT, UINT*);	/* Forward data to the stream */
 #endif

 #if _USE_MKFS
-FRESULT f_mkfs ( BYTE, BYTE, UINT );                /* Create a file system on the drive */
+FRESULT f_mkfs (BYTE, BYTE, UINT);					/* Create a file system on the drive */
 #endif

 #if _FS_RPATH
-FRESULT f_chdrive ( BYTE );                         /* Change current drive */
-FRESULT f_chdir ( const TCHAR * );                  /* Change current directory */
-FRESULT f_getcwd ( TCHAR *, UINT );                 /* Get current directory */
+FRESULT f_chdrive (BYTE);							/* Change current drive */
+FRESULT f_chdir (const TCHAR*);						/* Change current directory */
+FRESULT f_getcwd (TCHAR*, UINT);					/* Get current directory */
 #endif

 #if _USE_STRFUNC
-int f_putc ( TCHAR, FIL * );                        /* Put a character to the file */
-int f_puts ( const TCHAR *, FIL * );                /* Put a string to the file */
-int f_printf ( FIL *, const TCHAR *, ... );         /* Put a formatted string to the file */
-TCHAR *f_gets ( TCHAR *, int, FIL * );              /* Get a string from the file */
+int f_putc (TCHAR, FIL*);							/* Put a character to the file */
+int f_puts (const TCHAR*, FIL*);					/* Put a string to the file */
+int f_printf (FIL*, const TCHAR*, ...);				/* Put a formatted string to the file */
+TCHAR* f_gets (TCHAR*, int, FIL*);					/* Get a string from the file */
 #ifndef EOF
 #define EOF (-1)
 #endif
@ -464,25 +457,25 @@ TCHAR *f_gets ( TCHAR *, int, FIL * );              /* Get a string from the fil

 /* RTC function */
 #if !_FS_READONLY
-DWORD get_fattime ( void );
+DWORD get_fattime (void);
 #endif

 /* Unicode support functions */
 #if _USE_LFN						/* Unicode - OEM code conversion */
-WCHAR ff_convert ( WCHAR, UINT );   /* OEM-Unicode bidirectional conversion */
-WCHAR ff_wtoupper ( WCHAR );        /* Unicode upper-case conversion */
+WCHAR ff_convert (WCHAR, UINT);		/* OEM-Unicode bidirectional conversion */
+WCHAR ff_wtoupper (WCHAR);			/* Unicode upper-case conversion */
 #if _USE_LFN == 3					/* Memory functions */
-void *ff_memalloc ( UINT );         /* Allocate memory block */
-void ff_memfree ( void * );         /* Free memory block */
+void* ff_memalloc (UINT);			/* Allocate memory block */
+void ff_memfree (void*);			/* Free memory block */
 #endif
 #endif

 /* Sync functions */
 #if _FS_REENTRANT
-int ff_cre_syncobj ( BYTE, _SYNC_t * ); /* Create a sync object */
-int ff_del_syncobj ( _SYNC_t );     /* Delete a sync object */
-int ff_req_grant ( _SYNC_t );       /* Lock sync object */
-void ff_rel_grant ( _SYNC_t );      /* Unlock sync object */
+int ff_cre_syncobj (BYTE, _SYNC_t*);/* Create a sync object */
+int ff_del_syncobj (_SYNC_t);		/* Delete a sync object */
+int ff_req_grant (_SYNC_t);			/* Lock sync object */
+void ff_rel_grant (_SYNC_t);		/* Unlock sync object */
 #endif


--- a/src/bootldr/fileops.c
+++ b/src/bootldr/fileops.c
@ -12,46 +12,38 @@ WCHAR ff_convert(WCHAR w, UINT dir) {

 int newcard;

-void file_init()
-{
-    file_res = f_mount( 0, &fatfs );
+void file_init() {
+  file_res=f_mount(0, &fatfs);
  newcard = 0;
 }

-void file_reinit( void )
-{
+void file_reinit(void) {
  disk_init();
  file_init();
 }

-void file_open_by_filinfo( FILINFO *fno )
-{
-    file_res = l_openfilebycluster( &fatfs, &file_handle, ( TCHAR * )"", fno->clust, fno->fsize );
+void file_open_by_filinfo(FILINFO* fno) {
+  file_res = l_openfilebycluster(&fatfs, &file_handle, (TCHAR*)"", fno->clust, fno->fsize);
 }

-void file_open( uint8_t *filename, BYTE flags )
-{
-    if ( disk_state == DISK_CHANGED )
-    {
+void file_open(uint8_t* filename, BYTE flags) {
+  if (disk_state == DISK_CHANGED) {
    file_reinit();
    newcard = 1;
  }
-
-    file_res = f_open( &file_handle, ( TCHAR * )filename, flags );
-    file_block_off = sizeof( file_buf );
-    file_block_max = sizeof( file_buf );
+  file_res = f_open(&file_handle, (TCHAR*)filename, flags);
+  file_block_off = sizeof(file_buf);
+  file_block_max = sizeof(file_buf);
  file_status = file_res ? FILE_ERR : FILE_OK;
 }

-void file_close()
-{
-    file_res = f_close( &file_handle );
+void file_close() {
+  file_res = f_close(&file_handle);
 }

-UINT file_read()
-{
+UINT file_read() {
  UINT bytes_read;
-    file_res = f_read( &file_handle, file_buf, sizeof( file_buf ), &bytes_read );
+  file_res = f_read(&file_handle, file_buf, sizeof(file_buf), &bytes_read);
  return bytes_read;
 }

@ -64,17 +56,13 @@ UINT file_read()
  return bytes_written;
 }*/

-UINT file_readblock( void *buf, uint32_t addr, uint16_t size )
-{
+UINT file_readblock(void* buf, uint32_t addr, uint16_t size) {
  UINT bytes_read;
-    file_res = f_lseek( &file_handle, addr );
-
-    if ( file_handle.fptr != addr )
-    {
+  file_res = f_lseek(&file_handle, addr);
+  if(file_handle.fptr != addr) {
    return 0;
  }
-
-    file_res = f_read( &file_handle, buf, size, &bytes_read );
+  file_res = f_read(&file_handle, buf, size, &bytes_read);
  return bytes_read;
 }

@ -86,19 +74,11 @@ UINT file_readblock( void *buf, uint32_t addr, uint16_t size )
  return bytes_written;
 }*/

-uint8_t file_getc()
-{
-    if ( file_block_off == file_block_max )
-    {
+uint8_t file_getc() {
+  if(file_block_off == file_block_max) {
    file_block_max = file_read();
-
-        if ( file_block_max == 0 )
-        {
-            file_status = FILE_EOF;
-        }
-
+    if(file_block_max == 0) file_status = FILE_EOF;
    file_block_off = 0;
  }
-
  return file_buf[file_block_off++];
 }
--- a/src/bootldr/fileops.h
+++ b/src/bootldr/fileops.h
@ -29,25 +29,24 @@
 #include <arm/NXP/LPC17xx/LPC17xx.h>
 #include "ff.h"

-enum filestates { FILE_OK = 0, FILE_ERR, FILE_EOF };
+enum filestates { FILE_OK=0, FILE_ERR, FILE_EOF };

-#define GCC_ALIGN_WORKAROUND __attribute__ ((aligned(4)))
-extern BYTE file_buf[512];
-extern FATFS fatfs;
-extern FIL file_handle;
-extern FRESULT file_res;
-extern uint8_t file_lfn[258];
-extern uint16_t file_block_off, file_block_max;
-extern enum filestates file_status;
+BYTE file_buf[512] __attribute__((aligned(4)));
+FATFS fatfs;
+FIL file_handle;
+FRESULT file_res;
+uint8_t file_lfn[258];
+uint16_t file_block_off, file_block_max;
+enum filestates file_status;

-void file_init( void );
-void file_open( uint8_t *filename, BYTE flags );
-void file_open_by_filinfo( FILINFO *fno );
-void file_close( void );
-UINT file_read( void );
-UINT file_write( void );
-UINT file_readblock( void *buf, uint32_t addr, uint16_t size );
-UINT file_writeblock( void *buf, uint32_t addr, uint16_t size );
+void file_init(void);
+void file_open(uint8_t* filename, BYTE flags);
+void file_open_by_filinfo(FILINFO* fno);
+void file_close(void);
+UINT file_read(void);
+UINT file_write(void);
+UINT file_readblock(void* buf, uint32_t addr, uint16_t size);
+UINT file_writeblock(void* buf, uint32_t addr, uint16_t size);

-uint8_t file_getc( void );
+uint8_t file_getc(void);
 #endif
--- a/src/bootldr/iap.c
+++ b/src/bootldr/iap.c
@ -12,284 +12,197 @@ uint32_t iap_cmd[5];
 uint32_t iap_res[5];
 uint32_t flash_sig[4];

-IAP iap_entry = ( IAP ) IAP_LOCATION;
+IAP iap_entry = (IAP) IAP_LOCATION;

-uint32_t calc_flash_crc( uint32_t start, uint32_t len )
-{
-    DBG_BL printf( "calc_flash_crc(%08lx, %08lx) {\n", start, len );
+uint32_t calc_flash_crc(uint32_t start, uint32_t len) {
+  DBG_BL printf("calc_flash_crc(%08lx, %08lx) {\n", start, len);
  uint32_t end = start + len;
-
-    if ( end > 0x20000 )
-    {
+  if(end > 0x20000) {
    len = 0x1ffff - start;
    end = 0x20000;
  }
-
  uint32_t crc = 0xffffffff;
  uint32_t s = start;
-
-    while ( s < end )
-    {
-        crc = crc32_update( crc, *( const unsigned char * )( s ) );
+  while(s < end) {
+    crc = crc32_update(crc, *(const unsigned char*)(s));
    s++;
  }
-
-    crc = crc_finalize( crc );
-    DBG_BL printf( "  crc generated. result=%08lx\n", crc );
-    DBG_BL printf( "} //calc_flash_crc\n" );
+  crc = crc_finalize(crc);
+  DBG_BL printf("  crc generated. result=%08lx\n", crc);
+  DBG_BL printf("} //calc_flash_crc\n");
  return crc;
 }

-void test_iap()
-{
-    iap_cmd[0] = 54;
-    iap_entry( iap_cmd, iap_res );
-    DBG_BL printf( "Part ID=%08lx\n", iap_res[1] );
+void test_iap() {
+  iap_cmd[0]=54;
+  iap_entry(iap_cmd, iap_res);
+  DBG_BL printf("Part ID=%08lx\n", iap_res[1]);
 }

-void print_header( sd2snes_fw_header *header )
-{
-    DBG_BL printf( "  magic = %08lx\n  version = %08lx\n  size = %08lx\n  crc = %08lx\n  ~crc = %08lx\n",
+void print_header(sd2snes_fw_header *header) {
+  DBG_BL printf("  magic = %08lx\n  version = %08lx\n  size = %08lx\n  crc = %08lx\n  ~crc = %08lx\n",
         header->magic, header->version, header->size,
-                   header->crc, header->crcc );
+         header->crc, header->crcc);
 }

-int check_header( sd2snes_fw_header *header, uint32_t crc )
-{
-    if ( ( header->magic != FW_MAGIC )
-            || ( header->size < 0x200 )
-            || ( header->size > ( 0x1ffff - FW_START ) )
-            || ( ( header->crc ^ header->crcc ) != 0xffffffff ) )
-    {
+int check_header(sd2snes_fw_header *header, uint32_t crc) {
+  if((header->magic != FW_MAGIC)
+     || (header->size < 0x200)
+     || (header->size > (0x1ffff - FW_START))
+     || ((header->crc ^ header->crcc) != 0xffffffff)) {
    return ERR_FLASHHD;
  }
-
-    if ( header->crc != crc )
-    {
+  if(header->crc != crc) {
    return ERR_FLASHCRC;
  }
-
  return ERR_OK;
 }

-FLASH_RES check_flash()
-{
-    sd2snes_fw_header *fw_header = ( sd2snes_fw_header * ) FW_START;
+FLASH_RES check_flash() {
+  sd2snes_fw_header *fw_header = (sd2snes_fw_header*) FW_START;
  uint32_t flash_addr = FW_START;
-
-    if ( flash_addr != FW_START )
-    {
-        DBG_BL printf( "address sanity check failed. expected 0x%08lx, got 0x%08lx.\nSomething is terribly wrong.\nBailing out to avoid bootldr self-corruption.\n",
-                       FW_START, flash_addr );
+  if(flash_addr != FW_START) {
+    DBG_BL printf("address sanity check failed. expected 0x%08lx, got 0x%08lx.\nSomething is terribly wrong.\nBailing out to avoid bootldr self-corruption.\n", FW_START, flash_addr);
    return ERR_HW;
  }
-
-    DBG_BL printf( "Current flash contents:\n" );
-    DBG_BL print_header( fw_header );
-    uint32_t crc = calc_flash_crc( flash_addr + 0x100, ( fw_header->size & 0x1ffff ) );
-    return check_header( fw_header, crc );
+  DBG_BL printf("Current flash contents:\n");
+  DBG_BL print_header(fw_header);
+  uint32_t crc = calc_flash_crc(flash_addr + 0x100, (fw_header->size & 0x1ffff));
+  return check_header(fw_header, crc);
 }

-IAP_RES iap_wrap( uint32_t *iap_cmd, uint32_t *iap_res )
-{
-    //  NVIC_DisableIRQ(RIT_IRQn);
-    //  NVIC_DisableIRQ(UART_IRQ);
-    for ( volatile int i = 0; i < 2048; i++ );
-
-    iap_entry( iap_cmd, iap_res );
-
-    for ( volatile int i = 0; i < 2048; i++ );
-
-    //  NVIC_EnableIRQ(UART_IRQ);
+IAP_RES iap_wrap(uint32_t *iap_cmd, uint32_t *iap_res) {
+//  NVIC_DisableIRQ(RIT_IRQn);
+//  NVIC_DisableIRQ(UART_IRQ);
+  for(volatile int i=0; i<2048; i++);
+  iap_entry(iap_cmd, iap_res);
+  for(volatile int i=0; i<2048; i++);
+//  NVIC_EnableIRQ(UART_IRQ);
  return iap_res[0];
 }

-IAP_RES iap_prepare_for_write( uint32_t start, uint32_t end )
-{
-    if ( start < ( FW_START / 0x1000 ) )
-    {
-        return INVALID_SECTOR;
-    }
-
+IAP_RES iap_prepare_for_write(uint32_t start, uint32_t end) {
+  if(start < (FW_START / 0x1000)) return INVALID_SECTOR;
  iap_cmd[0] = 50;
  iap_cmd[1] = start;
  iap_cmd[2] = end;
-    iap_wrap( iap_cmd, iap_res );
+  iap_wrap(iap_cmd, iap_res);
  return iap_res[0];
 }

-IAP_RES iap_erase( uint32_t start, uint32_t end )
-{
-    if ( start < ( FW_START / 0x1000 ) )
-    {
-        return INVALID_SECTOR;
-    }
-
+IAP_RES iap_erase(uint32_t start, uint32_t end) {
+  if(start < (FW_START / 0x1000)) return INVALID_SECTOR;
  iap_cmd[0] = 52;
  iap_cmd[1] = start;
  iap_cmd[2] = end;
  iap_cmd[3] = CONFIG_CPU_FREQUENCY / 1000L;
-    iap_wrap( iap_cmd, iap_res );
+  iap_wrap(iap_cmd, iap_res);
  return iap_res[0];
 }

-IAP_RES iap_ram2flash( uint32_t tgt, uint8_t *src, int num )
-{
+IAP_RES iap_ram2flash(uint32_t tgt, uint8_t *src, int num) {
  iap_cmd[0] = 51;
  iap_cmd[1] = tgt;
-    iap_cmd[2] = ( uint32_t )src;
+  iap_cmd[2] = (uint32_t)src;
  iap_cmd[3] = num;
  iap_cmd[4] = CONFIG_CPU_FREQUENCY / 1000L;
-    iap_wrap( iap_cmd, iap_res );
+  iap_wrap(iap_cmd, iap_res);
  return iap_res[0];
 }

-FLASH_RES flash_file( uint8_t *filename )
-{
-    sd2snes_fw_header *fw_header = ( sd2snes_fw_header * ) FW_START;
+FLASH_RES flash_file(uint8_t *filename) {
+  sd2snes_fw_header *fw_header = (sd2snes_fw_header*) FW_START;
  uint32_t flash_addr = FW_START;
  uint32_t file_crc = 0xffffffff;
  uint16_t count;
  sd2snes_fw_header file_header;
  UINT bytes_read;
-
-    if ( flash_addr != FW_START )
-    {
-        DBG_BL printf( "address sanity check failed. expected 0x%08lx, got 0x%08lx.\nSomething is terribly wrong.\nBailing out to avoid bootldr self-corruption.\n",
-                       FW_START, flash_addr );
+  if(flash_addr != FW_START) {
+    DBG_BL printf("address sanity check failed. expected 0x%08lx, got 0x%08lx.\nSomething is terribly wrong.\nBailing out to avoid bootldr self-corruption.\n", FW_START, flash_addr);
    return ERR_HW;
  }
-
-    file_open( filename, FA_READ );
-
-    if ( file_res )
-    {
-        DBG_BL printf( "file_open: error %d\n", file_res );
+  file_open(filename, FA_READ);
+  if(file_res) {
+    DBG_BL printf("file_open: error %d\n", file_res);
    return ERR_FS;
  }
-
-    DBG_BL printf( "firmware image found. file size: %ld\n", file_handle.fsize );
-    DBG_BL printf( "reading header...\n" );
-    f_read( &file_handle, &file_header, 32, &bytes_read );
-    DBG_BL print_header( &file_header );
-
-    if ( check_flash() || file_header.version != fw_header->version || file_header.version == FW_MAGIC
-            || fw_header->version == FW_MAGIC )
-    {
-        DBG_UART uart_putc( 'F' );
-        f_read( &file_handle, file_buf, 0xe0, &bytes_read );
-
-        for ( ;; )
-        {
+  DBG_BL printf("firmware image found. file size: %ld\n", file_handle.fsize);
+  DBG_BL printf("reading header...\n");
+  f_read(&file_handle, &file_header, 32, &bytes_read);
+  DBG_BL print_header(&file_header);
+  if(check_flash() || file_header.version != fw_header->version || file_header.version == FW_MAGIC || fw_header->version == FW_MAGIC) {
+    DBG_UART uart_putc('F');
+    f_read(&file_handle, file_buf, 0xe0, &bytes_read);
+    for(;;) {
      bytes_read = file_read();
-
-            if ( file_res || !bytes_read )
-            {
-                break;
-            }
-
-            for ( count = 0; count < bytes_read; count++ )
-            {
-                file_crc = crc32_update( file_crc, file_buf[count] );
+      if(file_res || !bytes_read) break;
+      for(count = 0; count < bytes_read; count++) {
+        file_crc = crc32_update(file_crc, file_buf[count]);
      }
    }
-
-        file_crc = crc_finalize( file_crc );
-        DBG_BL printf( "file crc=%08lx\n", file_crc );
-
-        if ( check_header( &file_header, file_header.crc ) != ERR_OK )
-        {
-            DBG_BL printf( "Invalid firmware file (header corrupted).\n" );
+    file_crc = crc_finalize(file_crc);
+    DBG_BL printf("file crc=%08lx\n", file_crc);
+    if(check_header(&file_header, file_header.crc) != ERR_OK) {
+      DBG_BL printf("Invalid firmware file (header corrupted).\n");
      return ERR_FILEHD;
    }
-
-        if ( file_header.crc != file_crc )
-        {
-            DBG_BL printf( "Firmware file checksum error.\n" );
+    if(file_header.crc != file_crc) {
+      DBG_BL printf("Firmware file checksum error.\n");
      return ERR_FILECHK;
    }

    uint32_t res;

-        writeled( 1 );
-        DBG_BL printf( "erasing flash...\n" );
-        DBG_UART uart_putc( 'P' );
-
-        if ( ( res = iap_prepare_for_write( FW_START / 0x1000, FLASH_SECTORS ) ) != CMD_SUCCESS )
-        {
-            DBG_BL printf( "error %ld while preparing for erase\n", res );
-            DBG_UART uart_putc( 'X' );
+    writeled(1);
+    DBG_BL printf("erasing flash...\n");
+    DBG_UART uart_putc('P');
+    if((res = iap_prepare_for_write(FW_START / 0x1000, FLASH_SECTORS)) != CMD_SUCCESS) {
+      DBG_BL printf("error %ld while preparing for erase\n", res);
+      DBG_UART uart_putc('X');
      return ERR_FLASHPREP;
    };
-
-        DBG_UART uart_putc( 'E' );
-
-        if ( ( res = iap_erase( FW_START / 0x1000, FLASH_SECTORS ) ) != CMD_SUCCESS )
-        {
-            DBG_BL printf( "error %ld while erasing\n", res );
-            DBG_UART uart_putc( 'X' );
+    DBG_UART uart_putc('E');
+    if((res = iap_erase(FW_START / 0x1000, FLASH_SECTORS)) != CMD_SUCCESS) {
+      DBG_BL printf("error %ld while erasing\n", res);
+      DBG_UART uart_putc('X');
      return ERR_FLASHERASE;
    }
-
-        DBG_BL printf( "writing... @%08lx\n", flash_addr );
+    DBG_BL printf("writing... @%08lx\n", flash_addr);
    file_close();
-        file_open( filename, FA_READ );
+    file_open(filename, FA_READ);
    uint8_t current_sec;
    uint32_t total_read = 0;
-
-        for ( flash_addr = FW_START; flash_addr < 0x00020000; flash_addr += 0x200 )
-        {
-            total_read += ( bytes_read = file_read() );
-
-            if ( file_res || !bytes_read )
-            {
-                break;
-            }
-
-            current_sec = flash_addr & 0x10000 ? ( 16 + ( ( flash_addr >> 15 ) & 1 ) )
-                          : ( flash_addr >> 12 );
-            DBG_BL printf( "current_sec=%d flash_addr=%08lx\n", current_sec, flash_addr );
-            DBG_UART uart_putc( '.' );
-
-            if ( current_sec < ( FW_START / 0x1000 ) )
-            {
+    for(flash_addr = FW_START; flash_addr < 0x00020000; flash_addr += 0x200) {
+      total_read += (bytes_read = file_read());
+      if(file_res || !bytes_read) break;
+      current_sec = flash_addr & 0x10000 ? (16 + ((flash_addr >> 15) & 1))
+                                         : (flash_addr >> 12);
+      DBG_BL printf("current_sec=%d flash_addr=%08lx\n", current_sec, flash_addr);
+      DBG_UART uart_putc('.');
+      if(current_sec < (FW_START / 0x1000)) return ERR_FLASH;
+      DBG_UART uart_putc(current_sec["0123456789ABCDEFGH"]);
+      DBG_UART uart_putc('p');
+      if((res = iap_prepare_for_write(current_sec, current_sec)) != CMD_SUCCESS) {
+        DBG_BL printf("error %ld while preparing sector %d for write\n", res, current_sec);
+        DBG_UART uart_putc('X');
        return ERR_FLASH;
      }
-
-            DBG_UART uart_putc( current_sec["0123456789ABCDEFGH"] );
-            DBG_UART uart_putc( 'p' );
-
-            if ( ( res = iap_prepare_for_write( current_sec, current_sec ) ) != CMD_SUCCESS )
-            {
-                DBG_BL printf( "error %ld while preparing sector %d for write\n", res, current_sec );
-                DBG_UART uart_putc( 'X' );
-                return ERR_FLASH;
-            }
-
-            DBG_UART uart_putc( 'w' );
-
-            if ( ( res = iap_ram2flash( flash_addr, file_buf, 512 ) ) != CMD_SUCCESS )
-            {
-                //printf("error %ld while writing to address %08lx (sector %d)\n", res, flash_addr, current_sec);
-                DBG_UART uart_putc( 'X' );
+      DBG_UART uart_putc('w');
+      if((res = iap_ram2flash(flash_addr, file_buf, 512)) != CMD_SUCCESS) {
+        DBG_BL printf("error %ld while writing from %08lX to address %08lx (sector %d)\n", res, (uint32_t)file_buf, flash_addr, current_sec);
+        DBG_UART uart_putc('X');
        return ERR_FLASH;
      }
    }
-
-        if ( total_read != ( file_header.size + 0x100 ) )
-        {
-            DBG_BL printf( "wrote less data than expected! (%08lx vs. %08lx)\n", total_read, file_header.size );
-            //      DBG_UART uart_putc('X');
+    if(total_read != (file_header.size + 0x100)) {
+      DBG_BL printf("wrote less data than expected! (%08lx vs. %08lx)\n", total_read, file_header.size);
+//      DBG_UART uart_putc('X');
      return ERR_FILECHK;
    }
-
-        writeled( 0 );
+    writeled(0);
+  } else {
+    DBG_UART uart_putc('n');
+    DBG_BL printf("flash content is ok, no version mismatch, no forced upgrade. No need to flash\n");
  }
-    else
-    {
-        DBG_UART uart_putc( 'n' );
-        DBG_BL printf( "flash content is ok, no version mismatch, no forced upgrade. No need to flash\n" );
-    }
-
  return ERR_OK;
 }
--- a/src/bootldr/iap.h
+++ b/src/bootldr/iap.h
@ -2,30 +2,28 @@
 #define IAP_H

 #define IAP_LOCATION 0x1fff1ff1
-typedef void ( *IAP )( uint32_t *, uint32_t * );
+typedef void (*IAP)(uint32_t*, uint32_t*);

 typedef enum {ERR_OK = 0, ERR_HW, ERR_FS, ERR_FILEHD, ERR_FILECHK, ERR_FLASHHD, ERR_FLASHCRC, ERR_FLASHPREP, ERR_FLASHERASE, ERR_FLASH} FLASH_RES;

-typedef enum
-{
-    /* 0*/  CMD_SUCCESS = 0,
-    /* 1*/  INVALID_COMMAND,
-    /* 2*/  SRC_ADDR_ERROR,
-    /* 3*/  DST_ADDR_ERROR,
-    /* 4*/  SRC_ADDR_NOT_MAPPED,
-    /* 5*/  DST_ADDR_NOT_MAPPED,
-    /* 6*/  COUNT_ERROR,
-    /* 7*/  INVALID_SECTOR,
-    /* 8*/  SECTOR_NOT_BLANK,
-    /* 9*/  SECTOR_NOT_PREPARED_FOR_WRITE_OPERATION,
-    /*10*/  COMPARE_ERROR,
-    /*11*/  BUSY
+typedef enum {
+/* 0*/  CMD_SUCCESS = 0,
+/* 1*/  INVALID_COMMAND,
+/* 2*/  SRC_ADDR_ERROR,
+/* 3*/  DST_ADDR_ERROR,
+/* 4*/  SRC_ADDR_NOT_MAPPED,
+/* 5*/  DST_ADDR_NOT_MAPPED,
+/* 6*/  COUNT_ERROR,
+/* 7*/  INVALID_SECTOR,
+/* 8*/  SECTOR_NOT_BLANK,
+/* 9*/  SECTOR_NOT_PREPARED_FOR_WRITE_OPERATION,
+/*10*/  COMPARE_ERROR,
+/*11*/  BUSY
 } IAP_RES;

 #define FW_MAGIC     (0x44534E53)

-typedef struct
-{
+typedef struct {
  uint32_t magic;
  uint32_t version;
  uint32_t size;
@ -33,10 +31,10 @@ typedef struct
  uint32_t crcc;
 } sd2snes_fw_header;

-uint32_t calc_flash_crc( uint32_t start, uint32_t end );
-void test_iap( void );
-FLASH_RES check_flash( void );
-FLASH_RES flash_file( uint8_t *filename );
+uint32_t calc_flash_crc(uint32_t start, uint32_t end);
+void test_iap(void);
+FLASH_RES check_flash(void);
+FLASH_RES flash_file(uint8_t* filename);


 #endif
--- a/src/bootldr/led.c
+++ b/src/bootldr/led.c
@ -18,85 +18,73 @@ int led_writeledstate = 0;
   write  red    P1.23 PWM1[4]
 */

-void rdyled( unsigned int state )
-{
-    BITBANG( LPC_GPIO2->FIODIR, 4 ) = state;
+void rdyled(unsigned int state) {
+  BITBAND(LPC_GPIO2->FIODIR, 4) = state;
  led_rdyledstate = state;
 }

-void readled( unsigned int state )
-{
-    BITBANG( LPC_GPIO2->FIODIR, 5 ) = state;
+void readled(unsigned int state) {
+  BITBAND(LPC_GPIO2->FIODIR, 5) = state;
  led_readledstate = state;
 }

-void writeled( unsigned int state )
-{
-    BITBANG( LPC_GPIO1->FIODIR, 23 ) = state;
+void writeled(unsigned int state) {
+  BITBAND(LPC_GPIO1->FIODIR, 23) = state;
  led_writeledstate = state;
 }

-void led_clkout32( uint32_t val )
-{
-    while ( 1 )
-    {
-        rdyled( 1 );
-        delay_ms( 400 );
-        readled( ( val & BV( 31 ) ) >> 31 );
-        rdyled( 0 );
-        val <<= 1;
-        delay_ms( 400 );
+void led_clkout32(uint32_t val) {
+  while(1) {
+    rdyled(1);
+    delay_ms(400);
+    readled((val & BV(31))>>31);
+    rdyled(0);
+    val<<=1;
+    delay_ms(400);
  }
 }

-void toggle_rdy_led()
-{
-    rdyled( ~led_rdyledstate );
+void toggle_rdy_led() {
+  rdyled(~led_rdyledstate);
 }

-void toggle_read_led()
-{
-    readled( ~led_readledstate );
+void toggle_read_led() {
+  readled(~led_readledstate);
 }

-void toggle_write_led()
-{
-    writeled( ~led_writeledstate );
+void toggle_write_led() {
+  writeled(~led_writeledstate);
 }

-void led_panic()
-{
-    while ( 1 )
-    {
-        LPC_GPIO2->FIODIR |= BV( 4 ) | BV( 5 );
-        LPC_GPIO1->FIODIR |= BV( 23 );
-        delay_ms( 350 );
-        LPC_GPIO2->FIODIR &= ~( BV( 4 ) | BV( 5 ) );
-        LPC_GPIO1->FIODIR &= ~BV( 23 );
-        delay_ms( 350 );
+void led_panic() {
+  while(1) {
+    LPC_GPIO2->FIODIR |= BV(4) | BV(5);
+    LPC_GPIO1->FIODIR |= BV(23);
+    delay_ms(350);
+    LPC_GPIO2->FIODIR &= ~(BV(4) | BV(5));
+    LPC_GPIO1->FIODIR &= ~BV(23);
+    delay_ms(350);
  }
 }

-void led_std()
-{
-    BITBANG( LPC_PINCON->PINSEL4, 9 ) = 0;
-    BITBANG( LPC_PINCON->PINSEL4, 8 ) = 0;
+void led_std() {
+  BITBAND(LPC_PINCON->PINSEL4, 9) = 0;
+  BITBAND(LPC_PINCON->PINSEL4, 8) = 0;

-    BITBANG( LPC_PINCON->PINSEL4, 11 ) = 0;
-    BITBANG( LPC_PINCON->PINSEL4, 10 ) = 0;
+  BITBAND(LPC_PINCON->PINSEL4, 11) = 0;
+  BITBAND(LPC_PINCON->PINSEL4, 10) = 0;

-    BITBANG( LPC_PINCON->PINSEL3, 15 ) = 0;
-    BITBANG( LPC_PINCON->PINSEL3, 14 ) = 0;
+  BITBAND(LPC_PINCON->PINSEL3, 15) = 0;
+  BITBAND(LPC_PINCON->PINSEL3, 14) = 0;

-    BITBANG( LPC_PWM1->PCR, 12 ) = 0;
-    BITBANG( LPC_PWM1->PCR, 13 ) = 0;
-    BITBANG( LPC_PWM1->PCR, 14 ) = 0;
+  BITBAND(LPC_PWM1->PCR, 12) = 0;
+  BITBAND(LPC_PWM1->PCR, 13) = 0;
+  BITBAND(LPC_PWM1->PCR, 14) = 0;
 }

-void led_init()
-{
-    /* power is already connected by default */
-    /* set PCLK divider to 8 */
-    BITBANG( LPC_SC->PCLKSEL1, 21 ) = 1;
-    BITBANG( LPC_SC->PCLKSEL1, 20 ) = 1;
+void led_init() {
+/* power is already connected by default */
+/* set PCLK divider to 8 */
+  BITBAND(LPC_SC->PCLKSEL1, 21) = 1;
+  BITBAND(LPC_SC->PCLKSEL1, 20) = 1;
 }
--- a/src/bootldr/led.h
+++ b/src/bootldr/led.h
@ -3,15 +3,15 @@
 #ifndef _LED_H
 #define _LED_H

-void readled( unsigned int state );
-void writeled( unsigned int state );
-void rdyled( unsigned int state );
-void led_clkout32( uint32_t val );
-void toggle_rdy_led( void );
-void toggle_read_led( void );
-void toggle_write_led( void );
-void led_panic( void );
-void led_std( void );
-void led_init( void );
+void readled(unsigned int state);
+void writeled(unsigned int state);
+void rdyled(unsigned int state);
+void led_clkout32(uint32_t val);
+void toggle_rdy_led(void);
+void toggle_read_led(void);
+void toggle_write_led(void);
+void led_panic(void);
+void led_std(void);
+void led_init(void);

 #endif
--- a/src/bootldr/main.c
+++ b/src/bootldr/main.c
@ -20,113 +20,87 @@

 int i;

-BYTE file_buf[512] GCC_ALIGN_WORKAROUND;
-FATFS fatfs;
-FIL file_handle;
-FRESULT file_res;
-uint8_t file_lfn[258];
-uint16_t file_block_off, file_block_max;
-enum filestates file_status;
-
 volatile enum diskstates disk_state;
 extern volatile tick_t ticks;

-int ( *chain )( void );
+int (*chain)(void);

-int main( void )
-{
-    SNES_CIC_PAIR_REG->FIODIR = BV( SNES_CIC_PAIR_BIT );
-    BITBANG( SNES_CIC_PAIR_REG->FIOSET, SNES_CIC_PAIR_BIT ) = 1;
-
-    /*  LPC_GPIO2->FIODIR = BV(0) | BV(1) | BV(2); */
-    //  LPC_GPIO0->FIODIR = BV(16);
+int main(void) {
+  SNES_CIC_PAIR_REG->FIODIR = BV(SNES_CIC_PAIR_BIT);
+  BITBAND(SNES_CIC_PAIR_REG->FIOSET, SNES_CIC_PAIR_BIT) = 1;
+/*  LPC_GPIO2->FIODIR = BV(0) | BV(1) | BV(2); */
+//  LPC_GPIO0->FIODIR = BV(16);

 /* connect UART3 on P0[25:26] + SSP0 on P0[15:18] + MAT3.0 on P0[10] */
-    LPC_PINCON->PINSEL1 = BV( 18 ) | BV( 19 ) | BV( 20 ) | BV( 21 ) /* UART3 */
-                          | BV( 3 ) | BV( 5 );                /* SSP0 (FPGA) except SS */
-    LPC_PINCON->PINSEL0 = BV( 31 );                          /* SSP0 */
-    /*                      | BV(13) | BV(15) | BV(17) | BV(19)  SSP1 (SD) */
+  LPC_PINCON->PINSEL1 = BV(18) | BV(19) | BV(20) | BV(21) /* UART3 */
+                      | BV(3) | BV(5);                    /* SSP0 (FPGA) except SS */
+  LPC_PINCON->PINSEL0 = BV(31);                            /* SSP0 */
+/*                      | BV(13) | BV(15) | BV(17) | BV(19)  SSP1 (SD) */

 /* pull-down CIC data lines */
-    LPC_PINCON->PINMODE0 = BV( 0 ) | BV( 1 ) | BV( 2 ) | BV( 3 );
+  LPC_PINCON->PINMODE0 = BV(0) | BV(1) | BV(2) | BV(3);

  clock_disconnect();
  power_init();
  timer_init();
  DBG_UART uart_init();
  led_init();
-    readled( 0 );
-    rdyled( 1 );
-    writeled( 0 );
+  readled(0);
+  rdyled(1);
+  writeled(0);
 /* do this last because the peripheral init()s change PCLK dividers */
  clock_init();
-    //  LPC_PINCON->PINSEL0 |= BV(20) | BV(21);                  /* MAT3.0 (FPGA clock) */
+//  LPC_PINCON->PINSEL0 |= BV(20) | BV(21);                  /* MAT3.0 (FPGA clock) */
  sdn_init();

-    for ( i = 0; i < 20; i++ )
-    {
-        uart_putc( '-' );
-    }
+  for(i = 0; i < 20; i++) uart_putc('-');
+  uart_putc('\n');

-    uart_putc( '\n' );
-
-    DBG_BL printf( "chksum=%08lx\n", *( uint32_t * )28 );
-    /*DBG_BL*/ printf( "\n\nsd2snes mk.2 bootloader\nver.: " VER "\ncpu clock: %ld Hz\n", CONFIG_CPU_FREQUENCY );
-    DBG_BL printf( "PCONP=%lx\n", LPC_SC->PCONP );
-    /* setup timer (fpga clk) */
-    LPC_TIM3->CTCR = 0;
-    LPC_TIM3->EMR = EMC0TOGGLE;
-    LPC_TIM3->MCR = MR0R;
-    LPC_TIM3->MR0 = 1;
-    LPC_TIM3->TCR = 1;
+  DBG_BL printf("chksum=%08lx\n", *(uint32_t*)28);
+  /*DBG_BL*/ printf("\n\nsd2snes mk.2 bootloader\nver.: " VER "\ncpu clock: %ld Hz\n", CONFIG_CPU_FREQUENCY);
+DBG_BL printf("PCONP=%lx\n", LPC_SC->PCONP);
+/* setup timer (fpga clk) */
+  LPC_TIM3->CTCR=0;
+  LPC_TIM3->EMR=EMC0TOGGLE;
+  LPC_TIM3->MCR=MR0R;
+  LPC_TIM3->MR0=1;
+  LPC_TIM3->TCR=1;
  NVIC->ICER[0] = 0xffffffff;
  NVIC->ICER[1] = 0xffffffff;
-    FLASH_RES res = flash_file( ( uint8_t * )"/sd2snes/firmware.img" );
-
-    if ( res == ERR_FLASHPREP || res == ERR_FLASHERASE || res == ERR_FLASH )
-    {
-        rdyled( 0 );
-        writeled( 1 );
+  FLASH_RES res = flash_file((uint8_t*)"/sd2snes/firmware.img");
+  if(res == ERR_FLASHPREP || res == ERR_FLASHERASE || res == ERR_FLASH) {
+    rdyled(0);
+    writeled(1);
  }
-
-    if ( res == ERR_FILEHD || res == ERR_FILECHK )
-    {
-        rdyled( 0 );
-        readled( 1 );
+  if(res == ERR_FILEHD || res == ERR_FILECHK) {
+    rdyled(0);
+    readled(1);
  }
-
-    DBG_BL printf( "flash result = %d\n", res );
-
-    if ( res != ERR_OK )
-    {
-        if ( ( res = check_flash() ) != ERR_OK )
-        {
-            DBG_BL printf( "check_flash() failed with error %d, not booting.\n", res );
-
-            while ( 1 )
-            {
+  DBG_BL printf("flash result = %d\n", res);
+  if(res != ERR_OK) {
+    if((res = check_flash()) != ERR_OK) {
+      DBG_BL printf("check_flash() failed with error %d, not booting.\n", res);
+      while(1) {
        toggle_rdy_led();
-                delay_ms( 500 );
+        delay_ms(500);
      }
    }
  }
+  NVIC_DisableIRQ(RIT_IRQn);
+  NVIC_DisableIRQ(UART_IRQ);

-    NVIC_DisableIRQ( RIT_IRQn );
-    NVIC_DisableIRQ( UART_IRQ );
-
-    SCB->VTOR = FW_START + 0x00000100;
-    chain = ( void * )( *( ( uint32_t * )( FW_START + 0x00000104 ) ) );
-    uart_putc( "0123456789abcdef"[( ( uint32_t )chain >> 28 ) & 15] );
-    uart_putc( "0123456789abcdef"[( ( uint32_t )chain >> 24 ) & 15] );
-    uart_putc( "0123456789abcdef"[( ( uint32_t )chain >> 20 ) & 15] );
-    uart_putc( "0123456789abcdef"[( ( uint32_t )chain >> 16 ) & 15] );
-    uart_putc( "0123456789abcdef"[( ( uint32_t )chain >> 12 ) & 15] );
-    uart_putc( "0123456789abcdef"[( ( uint32_t )chain >> 8 ) & 15] );
-    uart_putc( "0123456789abcdef"[( ( uint32_t )chain >> 4 ) & 15] );
-    uart_putc( "0123456789abcdef"[( ( uint32_t )chain ) & 15] );
-    uart_putc( '\n' );
+  SCB->VTOR=FW_START+0x00000100;
+  chain = (void*)(*((uint32_t*)(FW_START+0x00000104)));
+  uart_putc("0123456789abcdef"[((uint32_t)chain>>28)&15]);
+  uart_putc("0123456789abcdef"[((uint32_t)chain>>24)&15]);
+  uart_putc("0123456789abcdef"[((uint32_t)chain>>20)&15]);
+  uart_putc("0123456789abcdef"[((uint32_t)chain>>16)&15]);
+  uart_putc("0123456789abcdef"[((uint32_t)chain>>12)&15]);
+  uart_putc("0123456789abcdef"[((uint32_t)chain>>8)&15]);
+  uart_putc("0123456789abcdef"[((uint32_t)chain>>4)&15]);
+  uart_putc("0123456789abcdef"[((uint32_t)chain)&15]);
+  uart_putc('\n');
  chain();
-
-    while ( 1 );
+  while(1);
 }

--- a/src/bootldr/power.c
+++ b/src/bootldr/power.c
@ -15,13 +15,12 @@
   * USB [enabled via usb_init]
   * PWM1
 */
-void power_init()
-{
-    LPC_SC->PCONP = BV( PCSSP0 )
-                    | BV( PCTIM3 )
-                    | BV( PCRTC )
-                    | BV( PCGPIO )
-                    | BV( PCPWM1 )
-                    //                 | BV(PCUSB)
+void power_init() {
+  LPC_SC->PCONP = BV(PCSSP0)
+                | BV(PCTIM3)
+                | BV(PCRTC)
+                | BV(PCGPIO)
+                | BV(PCPWM1)
+//                 | BV(PCUSB)
  ;
 }
--- a/src/bootldr/power.h
+++ b/src/bootldr/power.h
@ -38,6 +38,6 @@
 #define PCQEI   (18)
 #define PCGPIO  (15)

-void power_init( void );
+void power_init(void);

 #endif
--- a/src/bootldr/printf.c
+++ b/src/bootldr/printf.c
@ -62,29 +62,24 @@ static char *outptr;
 static int maxlen;

 /* printf */
-static void outchar( char x )
-{
-    if ( maxlen )
-    {
+static void outchar(char x) {
+  if (maxlen) {
    maxlen--;
-        outfunc( x );
+    outfunc(x);
    outlength++;
  }
 }

 /* sprintf */
-static void outstr( char x )
-{
-    if ( maxlen )
-    {
+static void outstr(char x) {
+  if (maxlen) {
    maxlen--;
    *outptr++ = x;
    outlength++;
  }
 }

-static int internal_nprintf( void ( *output_function )( char c ), const char *fmt, va_list ap )
-{
+static int internal_nprintf(void (*output_function)(char c), const char *fmt, va_list ap) {
  unsigned int width;
  unsigned int flags;
  unsigned int base = 0;
@ -92,38 +87,27 @@ static int internal_nprintf( void ( *output_function )( char c ), const char *fm

  outlength = 0;

-    while ( *fmt )
-    {
-        while ( 1 )
-        {
-            if ( *fmt == 0 )
-            {
+  while (*fmt) {
+    while (1) {
+      if (*fmt == 0)
        goto end;
-            }

-            if ( *fmt == '%' )
-            {
+      if (*fmt == '%') {
        fmt++;
-
-                if ( *fmt != '%' )
-                {
+        if (*fmt != '%')
          break;
      }
-            }

-            output_function( *fmt++ );
+      output_function(*fmt++);
    }

    flags = 0;
    width = 0;

    /* read all flags */
-        do
-        {
-            if ( flags < FLAG_WIDTH )
-            {
-                switch ( *fmt )
-                {
+    do {
+      if (flags < FLAG_WIDTH) {
+        switch (*fmt) {
        case '0':
          flags |= FLAG_ZEROPAD;
          continue;
@ -142,44 +126,36 @@ static int internal_nprintf( void ( *output_function )( char c ), const char *fm
        }
      }

-            if ( flags < FLAG_LONG )
-            {
-                if ( *fmt >= '0' && *fmt <= '9' )
-                {
+      if (flags < FLAG_LONG) {
+        if (*fmt >= '0' && *fmt <= '9') {
          unsigned char tmp = *fmt - '0';
-                    width = 10 * width + tmp;
+          width = 10*width + tmp;
          flags |= FLAG_WIDTH;
          continue;
        }

-                if ( *fmt == 'h' )
-                {
+        if (*fmt == 'h')
          continue;
-                }

-                if ( *fmt == 'l' )
-                {
+        if (*fmt == 'l') {
          flags |= FLAG_LONG;
          continue;
        }
      }

      break;
-        }
-        while ( *fmt++ );
+    } while (*fmt++);

    /* Strings */
-        if ( *fmt == 'c' || *fmt == 's' )
-        {
-            switch ( *fmt )
-            {
+    if (*fmt == 'c' || *fmt == 's') {
+      switch (*fmt) {
      case 'c':
-                buffer[0] = va_arg( ap, int );
+        buffer[0] = va_arg(ap, int);
        ptr = buffer;
        break;

      case 's':
-                ptr = va_arg( ap, char * );
+        ptr = va_arg(ap, char *);
        break;
      }

@ -187,11 +163,9 @@ static int internal_nprintf( void ( *output_function )( char c ), const char *fm
    }

    /* Numbers */
-        switch ( *fmt )
-        {
+    switch (*fmt) {
    case 'u':
      flags |= FLAG_UNSIGNED;
-
    case 'd':
      base = 10;
      break;
@ -202,10 +176,9 @@ static int internal_nprintf( void ( *output_function )( char c ), const char *fm
      break;

    case 'p': // pointer
-            output_function( '0' );
-            output_function( 'x' );
+      output_function('0');
+      output_function('x');
      width -= 2;
-
    case 'x':
    case 'X':
      base = 16;
@ -215,90 +188,60 @@ static int internal_nprintf( void ( *output_function )( char c ), const char *fm

    unsigned int num;

-        if ( !( flags & FLAG_UNSIGNED ) )
-        {
-            int tmp = va_arg( ap, int );
-
-            if ( tmp < 0 )
-            {
+    if (!(flags & FLAG_UNSIGNED)) {
+      int tmp = va_arg(ap, int);
+      if (tmp < 0) {
        num = -tmp;
        flags |= FLAG_NEGATIVE;
-            }
-            else
-            {
+      } else
        num = tmp;
-            }
-        }
-        else
-        {
-            num = va_arg( ap, unsigned int );
+    } else {
+      num = va_arg(ap, unsigned int);
    }

    /* Convert number into buffer */
-        ptr = buffer + sizeof( buffer );
+    ptr = buffer + sizeof(buffer);
    *--ptr = 0;
-
-        do
-        {
+    do {
      *--ptr = hexdigits[num % base];
      num /= base;
-        }
-        while ( num != 0 );
+    } while (num != 0);

    /* Sign */
-        if ( flags & FLAG_NEGATIVE )
-        {
-            output_function( '-' );
+    if (flags & FLAG_NEGATIVE) {
+      output_function('-');
      width--;
-        }
-        else if ( flags & FLAG_FORCESIGN )
-        {
-            output_function( '+' );
+    } else if (flags & FLAG_FORCESIGN) {
+      output_function('+');
      width--;
-        }
-        else if ( flags & FLAG_BLANK )
-        {
-            output_function( ' ' );
+    } else if (flags & FLAG_BLANK) {
+      output_function(' ');
      width--;
    }

-output:
-
+  output:
    /* left padding */
-        if ( ( flags & FLAG_WIDTH ) && !( flags & FLAG_LEFTADJ ) )
-        {
-            while ( strlen( ptr ) < width )
-            {
-                if ( flags & FLAG_ZEROPAD )
-                {
-                    output_function( '0' );
-                }
+    if ((flags & FLAG_WIDTH) && !(flags & FLAG_LEFTADJ)) {
+      while (strlen(ptr) < width) {
+        if (flags & FLAG_ZEROPAD)
+          output_function('0');
        else
-                {
-                    output_function( ' ' );
-                }
-
+          output_function(' ');
        width--;
      }
    }

    /* data */
-        while ( *ptr )
-        {
-            output_function( *ptr++ );
-
-            if ( width )
-            {
+    while (*ptr) {
+      output_function(*ptr++);
+      if (width)
        width--;
    }
-        }

    /* right padding */
-        if ( flags & FLAG_WIDTH )
-        {
-            while ( width )
-            {
-                output_function( ' ' );
+    if (flags & FLAG_WIDTH) {
+      while (width) {
+        output_function(' ');
        width--;
      }
    }
@ -306,69 +249,52 @@ output:
    fmt++;
  }

-end:
+ end:
  return outlength;
 }

-int printf( const char *format, ... )
-{
+int printf(const char *format, ...) {
  va_list ap;
  int res;

  maxlen = -1;
-    va_start( ap, format );
-    res = internal_nprintf( outchar, format, ap );
-    va_end( ap );
+  va_start(ap, format);
+  res = internal_nprintf(outchar, format, ap);
+  va_end(ap);
  return res;
 }

-int snprintf( char *str, size_t size, const char *format, ... )
-{
+int snprintf(char *str, size_t size, const char *format, ...) {
  va_list ap;
  int res;

  maxlen = size;
  outptr = str;
-    va_start( ap, format );
-    res = internal_nprintf( outstr, format, ap );
-    va_end( ap );
-
-    if ( res < size )
-    {
+  va_start(ap, format);
+  res = internal_nprintf(outstr, format, ap);
+  va_end(ap);
+  if (res < size)
    str[res] = 0;
-    }
-
  return res;
 }

 /* Required for gcc compatibility */
-int puts( const char *str )
-{
-    uart_puts( str );
-    uart_putc( '\n' );
+int puts(const char *str) {
+  uart_puts(str);
+  uart_putc('\n');
  return 0;
 }

 #undef putchar
-int putchar( int c )
-{
-    uart_putc( c );
+int putchar(int c) {
+  uart_putc(c);
  return 0;
 }

 #else
-int printf( const char *format, ... )
-{
-    return 0;
-}
-//int snprintf(char *str, size_t size, const char *format, ...) { return 0; }
-int puts( const char *str )
-{
-    return 0;
-}
+int printf(const char *format, ...) { return 0; }
+int snprintf(char *str, size_t size, const char *format, ...) { return 0; }
+int puts(const char *str) { return 0; }
 #undef putchar
-int putchar( int c )
-{
-    return 0;
-}
+int putchar(int c) { return 0; }
 #endif
--- a/src/bootldr/sdnative.c
+++ b/src/bootldr/sdnative.c
--- a/src/bootldr/timer.c
+++ b/src/bootldr/timer.c
@ -1,4 +1,5 @@
 /* ___INGO___ */
+
 #include <arm/NXP/LPC17xx/LPC17xx.h>
 #include "bits.h"
 #include "config.h"
@ -17,42 +18,39 @@ extern volatile int sd_changed;
 volatile tick_t ticks;
 volatile int wokefromrit;

-void timer_init( void )
-{
+void timer_init(void) {
  /* turn on power to RIT */
-    BITBANG( LPC_SC->PCONP, PCRIT ) = 1;
+  BITBAND(LPC_SC->PCONP, PCRIT) = 1;

  /* clear RIT mask */
  LPC_RIT->RIMASK = 0; /*xffffffff;*/

  /* PCLK = CCLK */
-    BITBANG( LPC_SC->PCLKSEL1, 26 ) = 1;
-    BITBANG( LPC_SC->PCLKSEL1, PCLK_TIMER3 ) = 1;
+  BITBAND(LPC_SC->PCLKSEL1, 26) = 1;
+  BITBAND(LPC_SC->PCLKSEL1, PCLK_TIMER3) = 1;
 }

-void delay_us( unsigned int time )
-{
+void delay_us(unsigned int time) {
  /* Prepare RIT */
  LPC_RIT->RICOUNTER = 0;
-    LPC_RIT->RICOMPVAL = ( CONFIG_CPU_FREQUENCY / 1000000 ) * time;
-    LPC_RIT->RICTRL    = BV( RITEN ) | BV( RITINT );
+  LPC_RIT->RICOMPVAL = (CONFIG_CPU_FREQUENCY / 1000000) * time;
+  LPC_RIT->RICTRL    = BV(RITEN) | BV(RITINT);

  /* Wait until RIT signals an interrupt */
-    while ( !( BITBANG( LPC_RIT->RICTRL, RITINT ) ) ) ;
+  while (!(BITBAND(LPC_RIT->RICTRL, RITINT))) ;

  /* Disable RIT */
  LPC_RIT->RICTRL = 0;
 }

-void delay_ms( unsigned int time )
-{
+void delay_ms(unsigned int time) {
  /* Prepare RIT */
  LPC_RIT->RICOUNTER = 0;
-    LPC_RIT->RICOMPVAL = ( CONFIG_CPU_FREQUENCY / 1000 ) * time;
-    LPC_RIT->RICTRL    = BV( RITEN ) | BV( RITINT );
+  LPC_RIT->RICOMPVAL = (CONFIG_CPU_FREQUENCY / 1000) * time;
+  LPC_RIT->RICTRL    = BV(RITEN) | BV(RITINT);

  /* Wait until RIT signals an interrupt */
-    while ( !( BITBANG( LPC_RIT->RICTRL, RITINT ) ) ) ;
+  while (!(BITBAND(LPC_RIT->RICTRL, RITINT))) ;

  /* Disable RIT */
  LPC_RIT->RICTRL = 0;
--- a/src/bootldr/timer.h
+++ b/src/bootldr/timer.h
@ -13,8 +13,7 @@ extern volatile tick_t ticks;
 *
 * This inline function returns the current system tick count.
 */
-static inline tick_t getticks( void )
-{
+static inline tick_t getticks(void) {
  return ticks;
 }

@ -40,13 +39,13 @@ static inline tick_t getticks( void )
 #define time_before(a,b)        time_after(b,a)


-void timer_init( void );
+void timer_init(void);

 /* delay for "time" microseconds - uses the RIT */
-void delay_us( unsigned int time );
+void delay_us(unsigned int time);

 /* delay for "time" milliseconds - uses the RIT */
-void delay_ms( unsigned int time );
-void sleep_ms( unsigned int time );
+void delay_ms(unsigned int time);
+void sleep_ms(unsigned int time);

 #endif
--- a/src/bootldr/uart.c
+++ b/src/bootldr/uart.c
@ -75,179 +75,128 @@
 }
 */
 //static char txbuf[1 << CONFIG_UART_TX_BUF_SHIFT];
-static volatile unsigned int read_idx, write_idx;
-
-void uart_putc( char c )
-{
-    if ( c == '\n' )
-    {
-        uart_putc( '\r' );
-    }
-
-    while ( !( UART_REGS->LSR & ( 0x20 ) ) );
+static volatile unsigned int read_idx,write_idx;

+void uart_putc(char c) {
+  if (c == '\n')
+    uart_putc('\r');
+  while(!(UART_REGS->LSR & (0x20)));
  UART_REGS->THR = c;
 }

 /* Polling version only */
-unsigned char uart_getc( void )
-{
+unsigned char uart_getc(void) {
  /* wait for character */
-    while ( !( BITBANG( UART_REGS->LSR, 0 ) ) ) ;
-
+  while (!(BITBAND(UART_REGS->LSR, 0))) ;
  return UART_REGS->RBR;
 }

 /* Returns true if a char is ready */
-unsigned char uart_gotc( void )
-{
-    return BITBANG( UART_REGS->LSR, 0 );
+unsigned char uart_gotc(void) {
+  return BITBAND(UART_REGS->LSR, 0);
 }

-void uart_init( void )
-{
+void uart_init(void) {
  uint32_t div;

  /* Turn on power to UART */
-    BITBANG( LPC_SC->PCONP, UART_PCONBIT ) = 1;
+  BITBAND(LPC_SC->PCONP, UART_PCONBIT) = 1;

  /* UART clock = CPU clock - this block is reduced at compile-time */
-    if ( CONFIG_UART_PCLKDIV == 1 )
-    {
-        BITBANG( LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 1;
-        BITBANG( LPC_SC->UART_PCLKREG, UART_PCLKBIT + 1 ) = 0;
-    }
-    else if ( CONFIG_UART_PCLKDIV == 2 )
-    {
-        BITBANG( LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 0;
-        BITBANG( LPC_SC->UART_PCLKREG, UART_PCLKBIT + 1 ) = 1;
-    }
-    else if ( CONFIG_UART_PCLKDIV == 4 )
-    {
-        BITBANG( LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 0;
-        BITBANG( LPC_SC->UART_PCLKREG, UART_PCLKBIT + 1 ) = 0;
-    }
-    else     // Fallback: Divide by 8
-    {
-        BITBANG( LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 1;
-        BITBANG( LPC_SC->UART_PCLKREG, UART_PCLKBIT + 1 ) = 1;
+  if (CONFIG_UART_PCLKDIV == 1) {
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 1;
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT+1) = 0;
+  } else if (CONFIG_UART_PCLKDIV == 2) {
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 0;
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT+1) = 1;
+  } else if (CONFIG_UART_PCLKDIV == 4) {
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 0;
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT+1) = 0;
+  } else { // Fallback: Divide by 8
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 1;
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT+1) = 1;
  }

  /* set baud rate - no fractional stuff for now */
-    UART_REGS->LCR = BV( 7 ) | 3; // always 8n1
+  UART_REGS->LCR = BV(7) | 3; // always 8n1
  div = 0xF80022; //0x850004; // baud2divisor(CONFIG_UART_BAUDRATE);

  UART_REGS->DLL = div & 0xff;
-    UART_REGS->DLM = ( div >> 8 ) & 0xff;
-    BITBANG( UART_REGS->LCR, 7 ) = 0;
+  UART_REGS->DLM = (div >> 8) & 0xff;
+  BITBAND(UART_REGS->LCR, 7) = 0;

-    if ( div & 0xff0000 )
-    {
-        UART_REGS->FDR = ( div >> 16 ) & 0xff;
+  if (div & 0xff0000) {
+    UART_REGS->FDR = (div >> 16) & 0xff;
  }

  /* reset and enable FIFO */
-    UART_REGS->FCR = BV( 0 );
+  UART_REGS->FCR = BV(0);

  UART_REGS->THR = '?';
 }

 /* --- generic code below --- */
-void uart_puthex( uint8_t num )
-{
+void uart_puthex(uint8_t num) {
  uint8_t tmp;
-    tmp = ( num & 0xf0 ) >> 4;
-
-    if ( tmp < 10 )
-    {
-        uart_putc( '0' + tmp );
-    }
+  tmp = (num & 0xf0) >> 4;
+  if (tmp < 10)
+    uart_putc('0'+tmp);
  else
-    {
-        uart_putc( 'a' + tmp - 10 );
-    }
+    uart_putc('a'+tmp-10);

  tmp = num & 0x0f;
-
-    if ( tmp < 10 )
-    {
-        uart_putc( '0' + tmp );
-    }
+  if (tmp < 10)
+    uart_putc('0'+tmp);
  else
-    {
-        uart_putc( 'a' + tmp - 10 );
-    }
+    uart_putc('a'+tmp-10);
 }

-void uart_trace( void *ptr, uint16_t start, uint16_t len )
-{
+void uart_trace(void *ptr, uint16_t start, uint16_t len) {
  uint16_t i;
  uint8_t j;
  uint8_t ch;
  uint8_t *data = ptr;

-    data += start;
+  data+=start;
+  for(i=0;i<len;i+=16) {

-    for ( i = 0; i < len; i += 16 )
-    {
-
-        uart_puthex( start >> 8 );
-        uart_puthex( start & 0xff );
-        uart_putc( '|' );
-        uart_putc( ' ' );
-
-        for ( j = 0; j < 16; j++ )
-        {
-            if ( i + j < len )
-            {
-                ch = *( data + j );
-                uart_puthex( ch );
+    uart_puthex(start>>8);
+    uart_puthex(start&0xff);
+    uart_putc('|');
+    uart_putc(' ');
+    for(j=0;j<16;j++) {
+      if(i+j<len) {
+        ch=*(data + j);
+        uart_puthex(ch);
+      } else {
+        uart_putc(' ');
+        uart_putc(' ');
      }
-            else
-            {
-                uart_putc( ' ' );
-                uart_putc( ' ' );
+      uart_putc(' ');
    }
-
-            uart_putc( ' ' );
-        }
-
-        uart_putc( '|' );
-
-        for ( j = 0; j < 16; j++ )
-        {
-            if ( i + j < len )
-            {
-                ch = *( data++ );
-
-                if ( ch < 32 || ch > 0x7e )
-                {
-                    ch = '.';
-                }
-
-                uart_putc( ch );
-            }
-            else
-            {
-                uart_putc( ' ' );
+    uart_putc('|');
+    for(j=0;j<16;j++) {
+      if(i+j<len) {
+        ch=*(data++);
+        if(ch<32 || ch>0x7e)
+          ch='.';
+        uart_putc(ch);
+      } else {
+        uart_putc(' ');
      }
    }
-
-        uart_putc( '|' );
+    uart_putc('|');
    uart_putcrlf();
-        start += 16;
+    start+=16;
  }
 }

-void uart_flush( void )
-{
-    while ( read_idx != write_idx ) ;
+void uart_flush(void) {
+  while (read_idx != write_idx) ;
 }

-void uart_puts( const char *text )
-{
-    while ( *text )
-    {
-        uart_putc( *text++ );
+void uart_puts(const char *text) {
+  while (*text) {
+    uart_putc(*text++);
  }
 }
--- a/src/bootldr/uart.h
+++ b/src/bootldr/uart.h
@ -16,21 +16,21 @@

 #ifdef __AVR__
 #  include <avr/pgmspace.h>
-void uart_puts_P( prog_char *text );
+  void uart_puts_P(prog_char *text);
 #else
 #  define uart_puts_P(str) uart_puts(str)
 #endif

-void uart_init( void );
-unsigned char uart_getc( void );
-unsigned char uart_gotc( void );
-void uart_putc( char c );
-void uart_puts( const char *str );
-void uart_puthex( uint8_t num );
-void uart_trace( void *ptr, uint16_t start, uint16_t len );
-void uart_flush( void );
-int  printf( const char *fmt, ... );
-int  snprintf( char *str, size_t size, const char *format, ... );
+void uart_init(void);
+unsigned char uart_getc(void);
+unsigned char uart_gotc(void);
+void uart_putc(char c);
+void uart_puts(const char *str);
+void uart_puthex(uint8_t num);
+void uart_trace(void *ptr, uint16_t start, uint16_t len);
+void uart_flush(void);
+int  printf(const char *fmt, ...);
+int  snprintf(char *str, size_t size, const char *format, ...);
 #define uart_putcrlf() uart_putc('\n')

 /* A few symbols to make this code work for all four UARTs */
--- a/src/ccsbcs.c
+++ b/src/ccsbcs.c
@ -31,8 +31,7 @@
 #if _CODE_PAGE == 437
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP437(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP437(0x80-0xFF) to Unicode conversion table */
 	0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
 	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
 	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
@ -54,8 +53,7 @@ const WCHAR Tbl[] =     /*  CP437(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 720
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP720(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP720(0x80-0xFF) to Unicode conversion table */
 	0x0000, 0x0000, 0x00E9, 0x00E2, 0x0000, 0x00E0, 0x0000, 0x00E7,
 	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x0651, 0x0652, 0x00F4, 0x00A4, 0x0640, 0x00FB, 0x00F9,
@ -77,8 +75,7 @@ const WCHAR Tbl[] =     /*  CP720(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 737
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP737(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP737(0x80-0xFF) to Unicode conversion table */
 	0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398,
 	0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, 0x03A0,
 	0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9,
@ -100,8 +97,7 @@ const WCHAR Tbl[] =     /*  CP737(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 775
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP775(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP775(0x80-0xFF) to Unicode conversion table */
 	0x0106, 0x00FC, 0x00E9, 0x0101, 0x00E4, 0x0123, 0x00E5, 0x0107,
 	0x0142, 0x0113, 0x0156, 0x0157, 0x012B, 0x0179, 0x00C4, 0x00C5,
 	0x00C9, 0x00E6, 0x00C6, 0x014D, 0x00F6, 0x0122, 0x00A2, 0x015A,
@ -123,8 +119,7 @@ const WCHAR Tbl[] =     /*  CP775(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 850
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP850(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP850(0x80-0xFF) to Unicode conversion table */
 	0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
 	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
 	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
@ -146,8 +141,7 @@ const WCHAR Tbl[] =     /*  CP850(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 852
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP852(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP852(0x80-0xFF) to Unicode conversion table */
 	0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x016F, 0x0107, 0x00E7,
 	0x0142, 0x00EB, 0x0150, 0x0151, 0x00EE, 0x0179, 0x00C4, 0x0106,
 	0x00C9, 0x0139, 0x013A, 0x00F4, 0x00F6, 0x013D, 0x013E, 0x015A,
@ -169,8 +163,7 @@ const WCHAR Tbl[] =     /*  CP852(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 855
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP855(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP855(0x80-0xFF) to Unicode conversion table */
 	0x0452, 0x0402, 0x0453, 0x0403, 0x0451, 0x0401, 0x0454, 0x0404,
 	0x0455, 0x0405, 0x0456, 0x0406, 0x0457, 0x0407, 0x0458, 0x0408,
 	0x0459, 0x0409, 0x045A, 0x040A, 0x045B, 0x040B, 0x045C, 0x040C,
@ -192,8 +185,7 @@ const WCHAR Tbl[] =     /*  CP855(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 857
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP857(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP857(0x80-0xFF) to Unicode conversion table */
 	0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
 	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x0131, 0x00C4, 0x00C5,
 	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
@ -215,8 +207,7 @@ const WCHAR Tbl[] =     /*  CP857(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 858
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP858(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP858(0x80-0xFF) to Unicode conversion table */
 	0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
 	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
 	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
@ -238,8 +229,7 @@ const WCHAR Tbl[] =     /*  CP858(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 862
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP862(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP862(0x80-0xFF) to Unicode conversion table */
 	0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7,
 	0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
 	0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7,
@ -261,8 +251,7 @@ const WCHAR Tbl[] =     /*  CP862(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 866
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP866(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP866(0x80-0xFF) to Unicode conversion table */
 	0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
 	0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
 	0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
@ -284,8 +273,7 @@ const WCHAR Tbl[] =     /*  CP866(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 874
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP874(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP874(0x80-0xFF) to Unicode conversion table */
 	0x20AC, 0x0000, 0x0000, 0x0000, 0x0000, 0x2026, 0x0000, 0x0000,
 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
@ -307,8 +295,7 @@ const WCHAR Tbl[] =     /*  CP874(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 1250
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP1250(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP1250(0x80-0xFF) to Unicode conversion table */
 	0x20AC, 0x0000, 0x201A, 0x0000, 0x201E, 0x2026, 0x2020, 0x2021,
 	0x0000, 0x2030, 0x0160, 0x2039, 0x015A, 0x0164, 0x017D, 0x0179,
 	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
@ -330,8 +317,7 @@ const WCHAR Tbl[] =     /*  CP1250(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 1251
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP1251(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP1251(0x80-0xFF) to Unicode conversion table */
 	0x0402, 0x0403, 0x201A, 0x0453, 0x201E, 0x2026, 0x2020, 0x2021,
 	0x20AC, 0x2030, 0x0409, 0x2039, 0x040A, 0x040C, 0x040B, 0x040F,
 	0x0452, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
@ -353,8 +339,7 @@ const WCHAR Tbl[] =     /*  CP1251(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 1252
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP1252(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP1252(0x80-0xFF) to Unicode conversion table */
 	0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
 	0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x017D, 0x0000,
 	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
@ -376,8 +361,7 @@ const WCHAR Tbl[] =     /*  CP1252(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 1253
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP1253(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP1253(0x80-0xFF) to Unicode conversion table */
 	0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
 	0x0000, 0x2030, 0x0000, 0x2039, 0x000C, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
@ -399,8 +383,7 @@ const WCHAR Tbl[] =     /*  CP1253(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 1254
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP1254(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP1254(0x80-0xFF) to Unicode conversion table */
 	0x20AC, 0x0000, 0x210A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
 	0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
@ -422,8 +405,7 @@ const WCHAR Tbl[] =     /*  CP1254(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 1255
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP1255(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP1255(0x80-0xFF) to Unicode conversion table */
 	0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
 	0x02C6, 0x2030, 0x0000, 0x2039, 0x0000, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
@ -445,8 +427,7 @@ const WCHAR Tbl[] =     /*  CP1255(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 1256
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP1256(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP1256(0x80-0xFF) to Unicode conversion table */
 	0x20AC, 0x067E, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
 	0x02C6, 0x2030, 0x0679, 0x2039, 0x0152, 0x0686, 0x0698, 0x0688,
 	0x06AF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
@ -468,8 +449,7 @@ const WCHAR Tbl[] =     /*  CP1256(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 1257
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP1257(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP1257(0x80-0xFF) to Unicode conversion table */
 	0x20AC, 0x0000, 0x201A, 0x0000, 0x201E, 0x2026, 0x2020, 0x2021,
 	0x0000, 0x2030, 0x0000, 0x2039, 0x0000, 0x00A8, 0x02C7, 0x00B8,
 	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
@ -491,8 +471,7 @@ const WCHAR Tbl[] =     /*  CP1257(0x80-0xFF) to Unicode conversion table */
 #elif _CODE_PAGE == 1258
 #define _TBLDEF 1
 static
-const WCHAR Tbl[] =     /*  CP1258(0x80-0xFF) to Unicode conversion table */
-{
+const WCHAR Tbl[] = {	/*  CP1258(0x80-0xFF) to Unicode conversion table */
 	0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
 	0x02C6, 0x2030, 0x0000, 0x2039, 0x0152, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
@ -527,29 +506,18 @@ WCHAR ff_convert (  /* Converted character, Returns zero on error */
 	WCHAR c;


-    if ( src < 0x80 )   /* ASCII */
-    {
+	if (src < 0x80) {	/* ASCII */
 		c = src;

-    }
-    else
-    {
-        if ( dir )      /* OEMCP to Unicode */
-        {
-            c = ( src >= 0x100 ) ? 0 : Tbl[src - 0x80];
+	} else {
+		if (dir) {		/* OEMCP to Unicode */
+			c = (src >= 0x100) ? 0 : Tbl[src - 0x80];

+		} else {		/* Unicode to OEMCP */
+			for (c = 0; c < 0x80; c++) {
+				if (src == Tbl[c]) break;
 			}
-        else            /* Unicode to OEMCP */
-        {
-            for ( c = 0; c < 0x80; c++ )
-            {
-                if ( src == Tbl[c] )
-                {
-                    break;
-                }
-            }
-
-            c = ( c + 0x80 ) & 0xFF;
+			c = (c + 0x80) & 0xFF;
 		}
 	}

@ -566,7 +534,7 @@ WCHAR ff_wtoupper ( /* Upper converted character */
 	int i;


-    for ( i = 0; tbl_lower[i] && chr != tbl_lower[i]; i++ ) ;
+	for (i = 0; tbl_lower[i] && chr != tbl_lower[i]; i++) ;

 	return tbl_lower[i] ? tbl_upper[i] : chr;
 }
--- a/src/cfg.c
+++ b/src/cfg.c
@ -3,8 +3,7 @@
 #include "uart.h"
 #include "fileops.h"

-cfg_t CFG =
-{
+cfg_t CFG = {
  .cfg_ver_maj = 1,
  .cfg_ver_min = 0,
  .last_game_valid = 0,
@ -15,58 +14,46 @@ cfg_t CFG =
  .bsx_time = 0x0619970301180530LL
 };

-int cfg_save()
-{
+int cfg_save() {
  int err = 0;
-    file_open( CFG_FILE, FA_CREATE_ALWAYS | FA_WRITE );
-
-    if ( file_writeblock( &CFG, 0, sizeof( CFG ) ) < sizeof( CFG ) )
-    {
+  file_open(CFG_FILE, FA_CREATE_ALWAYS | FA_WRITE);
+  if(file_writeblock(&CFG, 0, sizeof(CFG)) < sizeof(CFG)) {
    err = file_res;
  }
-
  file_close();
  return err;
 }

-int cfg_load()
-{
+int cfg_load() {
  int err = 0;
-    file_open( CFG_FILE, FA_READ );
-
-    if ( file_readblock( &CFG, 0, sizeof( CFG ) ) < sizeof( CFG ) )
-    {
+  file_open(CFG_FILE, FA_READ);
+  if(file_readblock(&CFG, 0, sizeof(CFG)) < sizeof(CFG)) {
    err = file_res;
  }
-
  file_close();
  return err;
 }

-int cfg_save_last_game( uint8_t *fn )
-{
+int cfg_save_last_game(uint8_t *fn) {
  int err = 0;
-    file_open( LAST_FILE, FA_CREATE_ALWAYS | FA_WRITE );
-    err = f_puts( ( const TCHAR * )fn, &file_handle );
+  file_open(LAST_FILE, FA_CREATE_ALWAYS | FA_WRITE);
+  err = f_puts((const TCHAR*)fn, &file_handle);
  file_close();
  return err;
 }

-int cfg_get_last_game( uint8_t *fn )
-{
+int cfg_get_last_game(uint8_t *fn) {
  int err = 0;
-    file_open( LAST_FILE, FA_READ );
-    f_gets( ( TCHAR * )fn, 255, &file_handle );
+  file_open(LAST_FILE, FA_READ);
+  f_gets((TCHAR*)fn, 255, &file_handle);
  file_close();
  return err;
 }

-void cfg_set_last_game_valid( uint8_t valid )
-{
+void cfg_set_last_game_valid(uint8_t valid) {
  CFG.last_game_valid = valid;
 }

-uint8_t cfg_is_last_game_valid()
-{
+uint8_t cfg_is_last_game_valid() {
  return CFG.last_game_valid;
 }
--- a/src/cfg.h
+++ b/src/cfg.h
@ -6,15 +6,13 @@
 #define CFG_FILE ((const uint8_t*)"/sd2snes/sd2snes.cfg")
 #define LAST_FILE ((const uint8_t*)"/sd2snes/lastgame.cfg")

-typedef enum
-{
+typedef enum {
  VIDMODE_AUTO = 0,
  VIDMODE_60,
  VIDMODE_50
 } cfg_vidmode_t;

-typedef struct _cfg_block
-{
+typedef struct _cfg_block {
  uint8_t cfg_ver_maj;
  uint8_t cfg_ver_min;
  uint8_t last_game_valid;
@ -25,17 +23,17 @@ typedef struct _cfg_block
  uint64_t bsx_time;
 } cfg_t;

-int cfg_save( void );
-int cfg_load( void );
+int cfg_save(void);
+int cfg_load(void);

-int cfg_save_last_game( uint8_t *fn );
-int cfg_get_last_game( uint8_t *fn );
+int cfg_save_last_game(uint8_t *fn);
+int cfg_get_last_game(uint8_t *fn);

-cfg_vidmode_t cfg_get_vidmode_menu( void );
-cfg_vidmode_t cfg_get_vidmode_game( void );
+cfg_vidmode_t cfg_get_vidmode_menu(void);
+cfg_vidmode_t cfg_get_vidmode_game(void);

-void cfg_set_last_game_valid( uint8_t );
-uint8_t cfg_is_last_game_valid( void );
-uint8_t cfg_is_pair_mode_allowed( void );
+void cfg_set_last_game_valid(uint8_t);
+uint8_t cfg_is_last_game_valid(void);
+uint8_t cfg_is_pair_mode_allowed(void);

 #endif
--- a/src/cic.c
+++ b/src/cic.c
@ -7,108 +7,74 @@
 char *cicstatenames[4] = { "CIC_OK", "CIC_FAIL", "CIC_PAIR", "CIC_SCIC" };
 char *cicstatefriendly[4] = {"Original or no CIC", "Original CIC(failed)", "SuperCIC enhanced", "SuperCIC detected, not used"};

-void print_cic_state()
-{
-    printf( "CIC state: %s\n", get_cic_statename( get_cic_state() ) );
+void print_cic_state() {
+  printf("CIC state: %s\n", get_cic_statename(get_cic_state()));
 }

-inline char *get_cic_statefriendlyname( enum cicstates state )
-{
+inline char *get_cic_statefriendlyname(enum cicstates state) {
  return cicstatefriendly[state];
 }

-inline char *get_cic_statename( enum cicstates state )
-{
+inline char *get_cic_statename(enum cicstates state) {
  return cicstatenames[state];
 }

-enum cicstates get_cic_state()
-{
+enum cicstates get_cic_state() {
  uint32_t count;
  uint32_t togglecount = 0;
  uint8_t state, state_old;

-    state_old = BITBAND( SNES_CIC_STATUS_REG->FIOPIN, SNES_CIC_STATUS_BIT );
-
-    /* this loop samples at ~10MHz */
-    for ( count = 0; count < CIC_SAMPLECOUNT; count++ )
-    {
-        state = BITBAND( SNES_CIC_STATUS_REG->FIOPIN, SNES_CIC_STATUS_BIT );
-
-        if ( state != state_old )
-        {
+  state_old = BITBAND(SNES_CIC_STATUS_REG->FIOPIN, SNES_CIC_STATUS_BIT);
+/* this loop samples at ~10MHz */
+  for(count=0; count<CIC_SAMPLECOUNT; count++) {
+    state = BITBAND(SNES_CIC_STATUS_REG->FIOPIN, SNES_CIC_STATUS_BIT);
+    if(state != state_old) {
      togglecount++;
    }
-
    state_old = state;
  }
-
-    printf( "%ld\n", togglecount );
-
-    /* CIC_TOGGLE_THRESH_PAIR > CIC_TOGGLE_THRESH_SCIC */
-    if ( togglecount > CIC_TOGGLE_THRESH_PAIR )
-    {
+  printf("%ld\n", togglecount);
+/* CIC_TOGGLE_THRESH_PAIR > CIC_TOGGLE_THRESH_SCIC */
+  if(togglecount > CIC_TOGGLE_THRESH_PAIR) {
    return CIC_PAIR;
-    }
-    else if ( togglecount > CIC_TOGGLE_THRESH_SCIC )
-    {
+  } else if(togglecount > CIC_TOGGLE_THRESH_SCIC) {
    return CIC_SCIC;
-    }
-    else if ( state )
-    {
+  } else if(state) {
    return CIC_OK;
-    }
-    else
-    {
-        return CIC_FAIL;
-    }
+  } else return CIC_FAIL;
 }

-void cic_init( int allow_pairmode )
-{
-    BITBAND( SNES_CIC_PAIR_REG->FIODIR, SNES_CIC_PAIR_BIT ) = 1;
-
-    if ( allow_pairmode )
-    {
-        BITBAND( SNES_CIC_PAIR_REG->FIOCLR, SNES_CIC_PAIR_BIT ) = 1;
-    }
-    else
-    {
-        BITBAND( SNES_CIC_PAIR_REG->FIOSET, SNES_CIC_PAIR_BIT ) = 1;
+void cic_init(int allow_pairmode) {
+  BITBAND(SNES_CIC_PAIR_REG->FIODIR, SNES_CIC_PAIR_BIT) = 1;
+  if(allow_pairmode) {
+    BITBAND(SNES_CIC_PAIR_REG->FIOCLR, SNES_CIC_PAIR_BIT) = 1;
+  } else {
+    BITBAND(SNES_CIC_PAIR_REG->FIOSET, SNES_CIC_PAIR_BIT) = 1;
  }
 }

 /* prepare GPIOs for pair mode + set initial modes */
-void cic_pair( int init_vmode, int init_d4 )
-{
-    cic_videomode( init_vmode );
-    cic_d4( init_d4 );
+void cic_pair(int init_vmode, int init_d4) {
+  cic_videomode(init_vmode);
+  cic_d4(init_d4);

-    BITBAND( SNES_CIC_D0_REG->FIODIR, SNES_CIC_D0_BIT ) = 1;
-    BITBAND( SNES_CIC_D1_REG->FIODIR, SNES_CIC_D1_BIT ) = 1;
+  BITBAND(SNES_CIC_D0_REG->FIODIR, SNES_CIC_D0_BIT) = 1;
+  BITBAND(SNES_CIC_D1_REG->FIODIR, SNES_CIC_D1_BIT) = 1;
 }

-void cic_videomode( int value )
-{
-    if ( value )
-    {
-        BITBAND( SNES_CIC_D0_REG->FIOSET, SNES_CIC_D0_BIT ) = 1;
-    }
-    else
-    {
-        BITBAND( SNES_CIC_D0_REG->FIOCLR, SNES_CIC_D0_BIT ) = 1;
+void cic_videomode(int value) {
+  if(value) {
+    BITBAND(SNES_CIC_D0_REG->FIOSET, SNES_CIC_D0_BIT) = 1;
+  } else {
+    BITBAND(SNES_CIC_D0_REG->FIOCLR, SNES_CIC_D0_BIT) = 1;
  }
 }

-void cic_d4( int value )
-{
-    if ( value )
-    {
-        BITBAND( SNES_CIC_D1_REG->FIOSET, SNES_CIC_D1_BIT ) = 1;
-    }
-    else
-    {
-        BITBAND( SNES_CIC_D1_REG->FIOCLR, SNES_CIC_D1_BIT ) = 1;
+void cic_d4(int value) {
+  if(value) {
+    BITBAND(SNES_CIC_D1_REG->FIOSET, SNES_CIC_D1_BIT) = 1;
+  } else {
+    BITBAND(SNES_CIC_D1_REG->FIOCLR, SNES_CIC_D1_BIT) = 1;
  }
 }

--- a/src/cic.h
+++ b/src/cic.h
@ -11,14 +11,14 @@
 enum cicstates { CIC_OK = 0, CIC_FAIL, CIC_PAIR, CIC_SCIC };
 enum cic_region { CIC_NTSC = 0, CIC_PAL };

-void print_cic_state( void );
-char *get_cic_statename( enum cicstates state );
-char *get_cic_statefriendlyname( enum cicstates state );
-enum cicstates get_cic_state( void );
-void cic_init( int allow_pairmode );
+void print_cic_state(void);
+char *get_cic_statename(enum cicstates state);
+char *get_cic_statefriendlyname(enum cicstates state);
+enum cicstates get_cic_state(void);
+void cic_init(int allow_pairmode);

-void cic_pair( int init_vmode, int init_d4 );
-void cic_videomode( int value );
-void cic_d4( int value );
+void cic_pair(int init_vmode, int init_d4);
+void cic_videomode(int value);
+void cic_d4(int value);

 #endif
--- a/src/cli.c
+++ b/src/cli.c
@ -42,7 +42,6 @@
 #include "fileops.h"
 #include "memory.h"
 #include "snes.h"
-#include "tests.h"
 #include "fpga.h"
 #include "fpga_spi.h"
 #include "cic.h"
@ -54,214 +53,161 @@
 #define MAX_LINE 250

 /* Variables */
-static char cmdbuffer[MAX_LINE + 1];
+static char cmdbuffer[MAX_LINE+1];
 static char *curchar;

 /* Word lists */
 static char command_words[] =
-    "cd\0reset\0sreset\0dir\0ls\0test\0exit\0loadrom\0loadraw\0saveraw\0put\0rm\0mkdir\0d4\0vmode\0mapper\0settime\0time\0setfeature\0hexdump\0w8\0w16\0memset\0memtest\0";
-enum { CMD_CD = 0, CMD_RESET, CMD_SRESET, CMD_DIR, CMD_LS, CMD_TEST, CMD_EXIT, CMD_LOADROM, CMD_LOADRAW, CMD_SAVERAW, CMD_PUT, CMD_RM, CMD_MKDIR, CMD_D4, CMD_VMODE, CMD_MAPPER, CMD_SETTIME, CMD_TIME, CMD_SETFEATURE, CMD_HEXDUMP, CMD_W8, CMD_W16, CMD_MEMSET, CMD_MEMTEST };
+  "cd\0reset\0sreset\0dir\0ls\0test\0exit\0loadrom\0loadraw\0saveraw\0put\0rm\0mkdir\0d4\0vmode\0mapper\0settime\0time\0setfeature\0hexdump\0w8\0w16\0memset\0";
+enum { CMD_CD = 0, CMD_RESET, CMD_SRESET, CMD_DIR, CMD_LS, CMD_TEST, CMD_EXIT, CMD_LOADROM, CMD_LOADRAW, CMD_SAVERAW, CMD_PUT, CMD_RM, CMD_MKDIR, CMD_D4, CMD_VMODE, CMD_MAPPER, CMD_SETTIME, CMD_TIME, CMD_SETFEATURE, CMD_HEXDUMP, CMD_W8, CMD_W16, CMD_MEMSET };

 /* ------------------------------------------------------------------------- */
 /*   Parse functions                                                         */
 /* ------------------------------------------------------------------------- */

 /* Skip spaces at curchar */
-static uint8_t skip_spaces( void )
-{
-    uint8_t res = ( *curchar == ' ' || *curchar == 0 );
+static uint8_t skip_spaces(void) {
+  uint8_t res = (*curchar == ' ' || *curchar == 0);

-    while ( *curchar == ' ' )
-    {
+  while (*curchar == ' ')
    curchar++;
-    }

  return res;
 }

 /* Parse the string in curchar for an integer with bounds [lower,upper] */
-static int32_t parse_unsigned( uint32_t lower, uint32_t upper, uint8_t base )
-{
+static int32_t parse_unsigned(uint32_t lower, uint32_t upper, uint8_t base) {
  char *end;
  uint32_t result;

-    if ( strlen( curchar ) == 1 && *curchar == '?' )
-    {
-        printf( "Number between %ld[0x%lx] and %ld[0x%lx] expected\n", lower, lower, upper, upper );
+  if (strlen(curchar) == 1 && *curchar == '?') {
+    printf("Number between %ld[0x%lx] and %ld[0x%lx] expected\n",lower,lower,upper,upper);
    return -2;
  }

-    result = strtoul( curchar, &end, base );
-
-    if ( ( *end != ' ' && *end != 0 ) || errno != 0 )
-    {
-        printf( "Invalid numeric argument\n" );
+  result = strtoul(curchar, &end, base);
+  if ((*end != ' ' && *end != 0) || errno != 0) {
+    printf("Invalid numeric argument\n");
    return -1;
  }

  curchar = end;
  skip_spaces();

-    if ( result < lower || result > upper )
-    {
-        printf( "Numeric argument out of range (%ld..%ld)\n", lower, upper );
+  if (result < lower || result > upper) {
+    printf("Numeric argument out of range (%ld..%ld)\n",lower,upper);
    return -1;
  }

  return result;
 }
 /* Parse the string starting with curchar for a word in wordlist */
-static int8_t parse_wordlist( char *wordlist )
-{
+static int8_t parse_wordlist(char *wordlist) {
  uint8_t i, matched;
  unsigned char *cur, *ptr;
  unsigned char c;

  i = 0;
-    ptr = ( unsigned char * )wordlist;
+  ptr = (unsigned char *)wordlist;

  // Command list on "?"
-    if ( strlen( curchar ) == 1 && *curchar == '?' )
-    {
-        printf( "Commands available: \n " );
-
-        while ( 1 )
-        {
+  if (strlen(curchar) == 1 && *curchar == '?') {
+    printf("Commands available: \n ");
+    while (1) {
      c = *ptr++;
-
-            if ( c == 0 )
-            {
-                if ( *ptr == 0 )
-                {
-                    printf( "\n" );
+      if (c == 0) {
+        if (*ptr == 0) {
+          printf("\n");
          return -2;
+        } else {
+          printf("\n ");
        }
-                else
-                {
-                    printf( "\n " );
-                }
-            }
-            else
-            {
-                uart_putc( c );
-            }
+      } else
+        uart_putc(c);
    }
  }

-    while ( 1 )
-    {
-        cur = ( unsigned char * )curchar;
+  while (1) {
+    cur = (unsigned char *)curchar;
    matched = 1;
    c = *ptr;
-
-        do
-        {
+    do {
      // If current word list character is \0: No match found
-            if ( c == 0 )
-            {
-                printf( "Unknown word: %s\n(use ? for help)", curchar );
+      if (c == 0) {
+        printf("Unknown word: %s\n(use ? for help)",curchar);
        return -1;
      }

-            if ( tolower( ( int )c ) != tolower( ( int )*cur ) )
-            {
+      if (tolower((int)c) != tolower((int)*cur)) {
        // Check for end-of-word
-                if ( cur != ( unsigned char * )curchar && ( *cur == ' ' || *cur == 0 ) )
-                {
+        if (cur != (unsigned char*)curchar && (*cur == ' ' || *cur == 0)) {
          // Partial match found, return that
          break;
-                }
-                else
-                {
+        } else {
          matched = 0;
          break;
        }
      }
-
      ptr++;
      cur++;
      c = *ptr;
-        }
-        while ( c != 0 );
+    } while (c != 0);

-        if ( matched )
-        {
+    if (matched) {
      char *tmp = curchar;

-            curchar = ( char * )cur;
-
+      curchar = (char *)cur;
      // Return match only if whitespace or end-of-string follows
      // (avoids mismatching partial words)
-            if ( skip_spaces() )
-            {
+      if (skip_spaces()) {
        return i;
-            }
-            else
-            {
-                printf( "Unknown word: %s\n(use ? for help)\n", tmp );
+      } else {
+        printf("Unknown word: %s\n(use ? for help)\n",tmp);
        return -1;
      }
-        }
-        else
-        {
+    } else {
      // Try next word in list
      i++;
-
-            while ( *ptr++ != 0 ) ;
+      while (*ptr++ != 0) ;
    }
  }
 }

 /* Read a line from serial, uses cmdbuffer as storage */
-static char *getline( char *prompt )
-{
-    int i = 0;
+static char *getline(char *prompt) {
+  int i=0;
  char c;

-    printf( "\n%s", prompt );
-    memset( cmdbuffer, 0, sizeof( cmdbuffer ) );
+  printf("\n%s",prompt);
+  memset(cmdbuffer,0,sizeof(cmdbuffer));

-    while ( 1 )
-    {
+  while (1) {
    c = uart_getc();
-
-        if ( c == 13 )
-        {
+    if (c == 13)
      break;
-        }

-        if ( c == 27 || c == 3 )
-        {
-            printf( "\\\n%s", prompt );
+    if (c == 27 || c == 3) {
+      printf("\\\n%s",prompt);
      i = 0;
-            memset( cmdbuffer, 0, sizeof( cmdbuffer ) );
+      memset(cmdbuffer,0,sizeof(cmdbuffer));
      continue;
    }

-        if ( c == 127 || c == 8 )
-        {
-            if ( i > 0 )
-            {
+    if (c == 127 || c == 8) {
+      if (i > 0) {
        i--;
-                uart_putc( 8 ); // backspace
-                uart_putc( ' ' ); // erase character
-                uart_putc( 8 ); // backspace
-            }
-            else
-            {
+        uart_putc(8);   // backspace
+        uart_putc(' '); // erase character
+        uart_putc(8);   // backspace
+      } else
        continue;
-            }
-        }
-        else
-        {
-            if ( i < sizeof( cmdbuffer ) - 1 )
-            {
+    } else {
+      if (i < sizeof(cmdbuffer)-1) {
        cmdbuffer[i++] = c;
-                uart_putc( c );
+        uart_putc(c);
      }
    }
  }
-
  cmdbuffer[i] = 0;
  return cmdbuffer;
 }
@ -272,391 +218,284 @@ static char *getline( char *prompt )
 /* ------------------------------------------------------------------------- */

 /* Reset */
-static void cmd_reset( void )
-{
+static void cmd_reset(void) {
  /* force watchdog reset */
  LPC_WDT->WDTC = 256; // minimal timeout
-    LPC_WDT->WDCLKSEL = BV( 31 ); // internal RC, lock register
-    LPC_WDT->WDMOD = BV( 0 ) | BV( 1 ); // enable watchdog and reset-by-watchdog
+  LPC_WDT->WDCLKSEL = BV(31); // internal RC, lock register
+  LPC_WDT->WDMOD = BV(0) | BV(1); // enable watchdog and reset-by-watchdog
  LPC_WDT->WDFEED = 0xaa;
  LPC_WDT->WDFEED = 0x55; // initial feed to really enable WDT
 }

 /* Show the contents of the current directory */
-static void cmd_show_directory( void )
-{
+static void cmd_show_directory(void) {
  FRESULT res;
  DIR dh;
  FILINFO finfo;
  uint8_t *name;

-    f_getcwd( ( TCHAR * )file_lfn, 255 );
+  f_getcwd((TCHAR*)file_lfn, 255);

-    res = f_opendir( &dh, ( TCHAR * )file_lfn );
-
-    if ( res != FR_OK )
-    {
-        printf( "f_opendir failed, result %d\n", res );
+  res = f_opendir(&dh, (TCHAR*)file_lfn);
+  if (res != FR_OK) {
+    printf("f_opendir failed, result %d\n",res);
    return;
  }

-    finfo.lfname = ( TCHAR * )file_lfn;
+  finfo.lfname = (TCHAR*)file_lfn;
  finfo.lfsize = 255;

-    do
-    {
+  do {
    /* Read the next entry */
-        res = f_readdir( &dh, &finfo );
-
-        if ( res != FR_OK )
-        {
-            printf( "f_readdir failed, result %d\n", res );
+    res = f_readdir(&dh, &finfo);
+    if (res != FR_OK) {
+      printf("f_readdir failed, result %d\n",res);
      return;
    }

    /* Abort if none was found */
-        if ( !finfo.fname[0] )
-        {
+    if (!finfo.fname[0])
      break;
-        }

    /* Skip volume labels */
-        if ( finfo.fattrib & AM_VOL )
-        {
+    if (finfo.fattrib & AM_VOL)
      continue;
-        }

    /* Select between LFN and 8.3 name */
-        if ( finfo.lfname[0] )
-        {
-            name = ( uint8_t * )finfo.lfname;
-        }
-        else
-        {
-            name = ( uint8_t * )finfo.fname;
-            strlwr( ( char * )name );
+    if (finfo.lfname[0])
+      name = (uint8_t*)finfo.lfname;
+    else {
+      name = (uint8_t*)finfo.fname;
+      strlwr((char *)name);
    }

-        printf( "%s [%s] (%ld)", finfo.lfname, finfo.fname, finfo.fsize );
+    printf("%s [%s] (%ld)",finfo.lfname, finfo.fname, finfo.fsize);

    /* Directory indicator (Unix-style) */
-        if ( finfo.fattrib & AM_DIR )
-        {
-            uart_putc( '/' );
-        }
+    if (finfo.fattrib & AM_DIR)
+      uart_putc('/');

-        printf( "\n" );
-    }
-    while ( finfo.fname[0] );
+    printf("\n");
+  } while (finfo.fname[0]);
 }


-static void cmd_loadrom( void )
-{
+static void cmd_loadrom(void) {
  uint32_t address = 0;
  uint8_t flags = LOADROM_WITH_SRAM | LOADROM_WITH_RESET;
-    load_rom( ( uint8_t * )curchar, address, flags );
+  load_rom((uint8_t*)curchar, address, flags);
 }

-static void cmd_loadraw( void )
-{
-    uint32_t address = parse_unsigned( 0, 16777216, 16 );
-    load_sram( ( uint8_t * )curchar, address );
+static void cmd_loadraw(void) {
+  uint32_t address = parse_unsigned(0,16777216,16);
+  load_sram((uint8_t*)curchar, address);
 }

-static void cmd_saveraw( void )
-{
-    uint32_t address = parse_unsigned( 0, 16777216, 16 );
-    uint32_t length = parse_unsigned( 0, 16777216, 16 );
-
-    if ( address != -1 && length != -1 )
-    {
-        save_sram( ( uint8_t * )curchar, length, address );
-    }
+static void cmd_saveraw(void) {
+  uint32_t address = parse_unsigned(0,16777216,16);
+  uint32_t length = parse_unsigned(0,16777216,16);
+  if(address != -1 && length != -1)
+    save_sram((uint8_t*)curchar, length, address);
 }

-static void cmd_d4( void )
-{
+static void cmd_d4(void) {
  int32_t hz;

-    if ( get_cic_state() != CIC_PAIR )
-    {
-        printf( "not in pair mode\n" );
+  if(get_cic_state() != CIC_PAIR) {
+    printf("not in pair mode\n");
+  } else {
+    hz = parse_unsigned(50,60,10);
+    if(hz==50) {
+      cic_d4(CIC_PAL);
+    } else {
+      cic_d4(CIC_NTSC);
    }
-    else
-    {
-        hz = parse_unsigned( 50, 60, 10 );
-
-        if ( hz == 50 )
-        {
-            cic_d4( CIC_PAL );
-        }
-        else
-        {
-            cic_d4( CIC_NTSC );
-        }
-
-        printf( "ok\n" );
+    printf("ok\n");
  }
 }

-static void cmd_vmode( void )
-{
+static void cmd_vmode(void) {
  int32_t hz;
-
-    if ( get_cic_state() != CIC_PAIR )
-    {
-        printf( "not in pair mode\n" );
+  if(get_cic_state() != CIC_PAIR) {
+    printf("not in pair mode\n");
+  } else {
+    hz = parse_unsigned(50,60,10);
+    if(hz==50) {
+      cic_videomode(CIC_PAL);
+    } else {
+      cic_videomode(CIC_NTSC);
    }
-    else
-    {
-        hz = parse_unsigned( 50, 60, 10 );
-
-        if ( hz == 50 )
-        {
-            cic_videomode( CIC_PAL );
-        }
-        else
-        {
-            cic_videomode( CIC_NTSC );
-        }
-
-        printf( "ok\n" );
+    printf("ok\n");
  }
 }

-void cmd_put( void )
-{
-    if ( *curchar != 0 )
-    {
-        file_open( ( uint8_t * )curchar, FA_CREATE_ALWAYS | FA_WRITE );
-
-        if ( file_res )
-        {
-            printf( "FAIL: error opening file %s\n", curchar );
+void cmd_put(void) {
+  if(*curchar != 0) {
+    file_open((uint8_t*)curchar, FA_CREATE_ALWAYS | FA_WRITE);
+    if(file_res) {
+      printf("FAIL: error opening file %s\n", curchar);
+    } else {
+      printf("OK, start xmodem transfer now.\n");
+      xmodem_rxfile(&file_handle);
    }
-        else
-        {
-            printf( "OK, start xmodem transfer now.\n" );
-            xmodem_rxfile( &file_handle );
-        }
-
    file_close();
-    }
-    else
-    {
-        printf( "Usage: put <filename>\n" );
+  } else {
+    printf("Usage: put <filename>\n");
  }
 }

-void cmd_rm( void )
-{
-    FRESULT res = f_unlink( curchar );
-
-    if ( res )
-    {
-        printf( "Error %d removing %s\n", res, curchar );
-    }
+void cmd_rm(void) {
+  FRESULT res = f_unlink(curchar);
+  if(res) printf("Error %d removing %s\n", res, curchar);
 }

-void cmd_mkdir( void )
-{
-    FRESULT res = f_mkdir( curchar );
-
-    if ( res )
-    {
-        printf( "Error %d creating directory %s\n", res, curchar );
-    }
+void cmd_mkdir(void) {
+  FRESULT res = f_mkdir(curchar);
+  if(res) printf("Error %d creating directory %s\n", res, curchar);
 }

-void cmd_mapper( void )
-{
+void cmd_mapper(void) {
  int32_t mapper;
-    mapper = parse_unsigned( 0, 7, 10 );
-    set_mapper( ( uint8_t )mapper & 0x7 );
-    printf( "mapper set to %ld\n", mapper );
+  mapper = parse_unsigned(0,7,10);
+  set_mapper((uint8_t)mapper & 0x7);
+  printf("mapper set to %ld\n", mapper);
 }

-void cmd_sreset( void )
-{
-    if ( *curchar != 0 )
-    {
+void cmd_sreset(void) {
+  if(*curchar != 0) {
    int32_t resetstate;
-        resetstate = parse_unsigned( 0, 1, 10 );
-        snes_reset( resetstate );
-    }
-    else
-    {
+    resetstate = parse_unsigned(0,1,10);
+    snes_reset(resetstate);
+  } else {
    snes_reset_pulse();
  }
 }
-void cmd_settime( void )
-{
+void cmd_settime(void) {
  struct tm time;
-
-    if ( strlen( curchar ) != 4 + 2 + 2 + 2 + 2 + 2 )
-    {
-        printf( "invalid time format (need YYYYMMDDhhmmss)\n" );
-    }
-    else
-    {
-        time.tm_sec = atoi( curchar + 4 + 2 + 2 + 2 + 2 );
-        curchar[4 + 2 + 2 + 2 + 2] = 0;
-        time.tm_min = atoi( curchar + 4 + 2 + 2 + 2 );
-        curchar[4 + 2 + 2 + 2] = 0;
-        time.tm_hour = atoi( curchar + 4 + 2 + 2 );
-        curchar[4 + 2 + 2] = 0;
-        time.tm_mday = atoi( curchar + 4 + 2 );
-        curchar[4 + 2] = 0;
-        time.tm_mon = atoi( curchar + 4 );
+  if(strlen(curchar) != 4+2+2 + 2+2+2) {
+    printf("invalid time format (need YYYYMMDDhhmmss)\n");
+  } else {
+    time.tm_sec = atoi(curchar+4+2+2+2+2);
+    curchar[4+2+2+2+2] = 0;
+    time.tm_min = atoi(curchar+4+2+2+2);
+    curchar[4+2+2+2] = 0;
+    time.tm_hour = atoi(curchar+4+2+2);
+    curchar[4+2+2] = 0;
+    time.tm_mday = atoi(curchar+4+2);
+    curchar[4+2] = 0;
+    time.tm_mon = atoi(curchar+4);
    curchar[4] = 0;
-        time.tm_year = atoi( curchar );
-        set_rtc( &time );
+    time.tm_year = atoi(curchar);
+    set_rtc(&time);
  }
 }

-void cmd_time( void )
-{
+void cmd_time(void) {
  struct tm time;
-    read_rtc( &time );
-    printf( "%04d-%02d-%02d %02d:%02d:%02d\n", time.tm_year, time.tm_mon,
-            time.tm_mday, time.tm_hour, time.tm_min, time.tm_sec );
+  read_rtc(&time);
+  printf("%04d-%02d-%02d %02d:%02d:%02d\n", time.tm_year, time.tm_mon,
+    time.tm_mday, time.tm_hour, time.tm_min, time.tm_sec);
 }

-void cmd_setfeature( void )
-{
-    uint8_t feat = parse_unsigned( 0, 255, 16 );
-    fpga_set_features( feat );
+void cmd_setfeature(void) {
+  uint8_t feat = parse_unsigned(0, 255, 16);
+  fpga_set_features(feat);
 }

-void cmd_hexdump( void )
-{
-    uint32_t offset = parse_unsigned( 0, 16777215, 16 );
-    uint32_t len = parse_unsigned( 0, 16777216, 16 );
-    sram_hexdump( offset, len );
+void cmd_hexdump(void) {
+  uint32_t offset = parse_unsigned(0, 16777215, 16);
+  uint32_t len = parse_unsigned(0, 16777216, 16);
+  sram_hexdump(offset, len);
 }

-void cmd_w8( void )
-{
-    uint32_t offset = parse_unsigned( 0, 16777215, 16 );
-    uint8_t val = parse_unsigned( 0, 255, 16 );
-    sram_writebyte( val, offset );
+void cmd_w8(void) {
+  uint32_t offset = parse_unsigned(0, 16777215, 16);
+  uint8_t val = parse_unsigned(0, 255, 16);
+  sram_writebyte(val, offset);
 }

-void cmd_w16( void )
-{
-    uint32_t offset = parse_unsigned( 0, 16777215, 16 );
-    uint16_t val = parse_unsigned( 0, 65535, 16 );
-    sram_writeshort( val, offset );
+void cmd_w16(void) {
+  uint32_t offset = parse_unsigned(0, 16777215, 16);
+  uint16_t val = parse_unsigned(0, 65535, 16);
+  sram_writeshort(val, offset);
 }

-void cmd_memset( void )
-{
-    uint32_t offset = parse_unsigned( 0, 16777215, 16 );
-    uint32_t len = parse_unsigned( 0, 16777216, 16 );
-    uint8_t val = parse_unsigned( 0, 255, 16 );
-    sram_memset( offset, len, val );
+void cmd_memset(void) {
+  uint32_t offset = parse_unsigned(0, 16777215, 16);
+  uint32_t len = parse_unsigned(0, 16777216, 16);
+  uint8_t val = parse_unsigned(0, 255, 16);
+  sram_memset(offset, len, val);
 }

 /* ------------------------------------------------------------------------- */
 /*   CLI interface functions                                                 */
 /* ------------------------------------------------------------------------- */

-void cli_init( void )
-{
+void cli_init(void) {
 }

-void cli_entrycheck()
-{
-    if ( uart_gotc() && uart_getc() == 27 )
-    {
-        printf( "*** BREAK\n" );
+void cli_entrycheck() {
+  if(uart_gotc() && uart_getc() == 27) {
+    printf("*** BREAK\n");
    cli_loop();
  }
 }

-void cli_loop( void )
-{
-    while ( 1 )
-    {
-        curchar = getline( ">" );
-        printf( "\n" );
+void cli_loop(void) {
+  while (1) {
+    curchar = getline(">");
+    printf("\n");

    /* Process medium changes before executing the command */
-        if ( disk_state != DISK_OK && disk_state != DISK_REMOVED )
-        {
+    if (disk_state != DISK_OK && disk_state != DISK_REMOVED) {
      FRESULT res;

-            printf( "Medium changed... " );
-            res = f_mount( 0, &fatfs );
-
-            if ( res != FR_OK )
-            {
-                printf( "Failed to mount new medium, result %d\n", res );
-            }
-            else
-            {
-                printf( "Ok\n" );
+      printf("Medium changed... ");
+      res = f_mount(0,&fatfs);
+      if (res != FR_OK) {
+        printf("Failed to mount new medium, result %d\n",res);
+      } else {
+        printf("Ok\n");
      }

    }

    /* Remove whitespace */
-        while ( *curchar == ' ' )
-        {
-            curchar++;
-        }
-
-        while ( strlen( curchar ) > 0 && curchar[strlen( curchar ) - 1] == ' ' )
-        {
-            curchar[strlen( curchar ) - 1] = 0;
-        }
+    while (*curchar == ' ') curchar++;
+    while (strlen(curchar) > 0 && curchar[strlen(curchar)-1] == ' ')
+      curchar[strlen(curchar)-1] = 0;

    /* Ignore empty lines */
-        if ( strlen( curchar ) == 0 )
-        {
+    if (strlen(curchar) == 0)
      continue;
-        }

    /* Parse command */
-        int8_t command = parse_wordlist( command_words );
-
-        if ( command < 0 )
-        {
+    int8_t command = parse_wordlist(command_words);
+    if (command < 0)
      continue;
-        }


    FRESULT res;
-
-        switch ( command )
-        {
+    switch (command) {
    case CMD_CD:
 #if _FS_RPATH
-            if ( strlen( curchar ) == 0 )
-            {
-                f_getcwd( ( TCHAR * )file_lfn, 255 );
-                printf( "%s\n", file_lfn );
+      if (strlen(curchar) == 0) {
+        f_getcwd((TCHAR*)file_lfn, 255);
+        printf("%s\n",file_lfn);
        break;
      }

-            res = f_chdir( ( const TCHAR * )curchar );
-
-            if ( res != FR_OK )
-            {
-                printf( "chdir %s failed with result %d\n", curchar, res );
+      res = f_chdir((const TCHAR *)curchar);
+      if (res != FR_OK) {
+        printf("chdir %s failed with result %d\n",curchar,res);
+      } else {
+        printf("Ok.\n");
      }
-            else
-            {
-                printf( "Ok.\n" );
-            }
-
 #else
-            printf( "cd not supported.\n" );
+      printf("cd not supported.\n");
      res;
 #endif
    break;
-
    case CMD_RESET:
      cmd_reset();
      break;
@ -742,10 +581,6 @@ void cli_loop( void )
      cmd_memset();
      break;

-        case CMD_MEMTEST:
-            test_mem();
-            break;
-
    }
  }
 }
--- a/src/cli.h
+++ b/src/cli.h
@ -27,8 +27,8 @@
 #ifndef CLI_H
 #define CLI_H

-void cli_init( void );
-void cli_loop( void );
-void cli_entrycheck( void );
+void cli_init(void);
+void cli_loop(void);
+void cli_entrycheck(void);

 #endif
--- a/src/clock.c
+++ b/src/clock.c
@ -7,19 +7,17 @@
 #include "bits.h"
 #include "uart.h"

-void clock_disconnect()
-{
+void clock_disconnect() {
  disconnectPLL0();
  disablePLL0();
 }

-void clock_init()
-{
+void clock_init() {

-    /* set flash access time to 5 clks (80<f<=100MHz) */
-    setFlashAccessTime( 5 );
+/* set flash access time to 5 clks (80<f<=100MHz) */
+  setFlashAccessTime(5);

-    /* setup PLL0 for ~44100*256*8 Hz
+/* setup PLL0 for ~44100*256*8 Hz
   Base clock: 12MHz
   Multiplier:  429
   Pre-Divisor:  19
@ -28,17 +26,17 @@ void clock_init()
   -> DAC freq = 44099.5 Hz
   -> FPGA freq = 11289473.7Hz
   First, disable and disconnect PLL0.
-    */
+*/
  clock_disconnect();

-    /* PLL is disabled and disconnected. setup PCLK NOW as it cannot be changed
+/* PLL is disabled and disconnected. setup PCLK NOW as it cannot be changed
   reliably with PLL0 connected.
   see:
   http://ics.nxp.com/support/documents/microcontrollers/pdf/errata.lpc1754.pdf
-    */
+*/


-    /* continue with PLL0 setup:
+/* continue with PLL0 setup:
   enable the xtal oscillator and wait for it to become stable
   set the oscillator as clk source for PLL0
   set PLL0 multiplier+predivider
@ -49,74 +47,101 @@ void clock_init()
   done
 */
  enableMainOsc();
-    setClkSrc( CLKSRC_MAINOSC );
-    setPLL0MultPrediv( 22, 1 );
+  setClkSrc(CLKSRC_MAINOSC);
+  setPLL0MultPrediv(22, 1);
  enablePLL0();
-    setCCLKDiv( 6 );
+  setCCLKDiv(6);
  connectPLL0();
+
+
+/* configure PLL1 for USB operation */
+  disconnectPLL1();
+  disablePLL1();
+  LPC_SC->PLL1CFG = 0x23;
+  enablePLL1();
+  connectPLL1();
+
 }

-void setFlashAccessTime( uint8_t clocks )
-{
-    LPC_SC->FLASHCFG = FLASHTIM( clocks );
+void setFlashAccessTime(uint8_t clocks) {
+  LPC_SC->FLASHCFG=FLASHTIM(clocks);
 }

-void setPLL0MultPrediv( uint16_t mult, uint8_t prediv )
-{
-    LPC_SC->PLL0CFG = PLL_MULT( mult ) | PLL_PREDIV( prediv );
+void setPLL0MultPrediv(uint16_t mult, uint8_t prediv) {
+  LPC_SC->PLL0CFG=PLL_MULT(mult) | PLL_PREDIV(prediv);
  PLL0feed();
 }

-void enablePLL0()
-{
+void enablePLL0() {
  LPC_SC->PLL0CON |= PLLE0;
  PLL0feed();
 }

-void disablePLL0()
-{
+void disablePLL0() {
  LPC_SC->PLL0CON &= ~PLLE0;
  PLL0feed();
 }

-void connectPLL0()
-{
-    while ( !( LPC_SC->PLL0STAT & PLOCK0 ) );
-
+void connectPLL0() {
+  while(!(LPC_SC->PLL0STAT & PLOCK0));
  LPC_SC->PLL0CON |= PLLC0;
  PLL0feed();
 }

-void disconnectPLL0()
-{
+void disconnectPLL0() {
  LPC_SC->PLL0CON &= ~PLLC0;
  PLL0feed();
 }

-void setCCLKDiv( uint8_t div )
-{
-    LPC_SC->CCLKCFG = CCLK_DIV( div );
+void setPLL1MultPrediv(uint16_t mult, uint8_t prediv) {
+  LPC_SC->PLL1CFG=PLL_MULT(mult) | PLL_PREDIV(prediv);
+  PLL1feed();
 }

-void enableMainOsc()
-{
-    LPC_SC->SCS = OSCEN;
-
-    while ( !( LPC_SC->SCS & OSCSTAT ) );
+void enablePLL1() {
+  LPC_SC->PLL1CON |= PLLE1;
+  PLL1feed();
 }

-void disableMainOsc()
-{
-    LPC_SC->SCS = 0;
+void disablePLL1() {
+  LPC_SC->PLL1CON &= ~PLLE1;
+  PLL1feed();
 }

-void PLL0feed()
-{
-    LPC_SC->PLL0FEED = 0xaa;
-    LPC_SC->PLL0FEED = 0x55;
+void connectPLL1() {
+  while(!(LPC_SC->PLL1STAT & PLOCK1));
+  LPC_SC->PLL1CON |= PLLC1;
+  PLL1feed();
 }

-void setClkSrc( uint8_t src )
-{
-    LPC_SC->CLKSRCSEL = src;
+void disconnectPLL1() {
+  LPC_SC->PLL1CON &= ~PLLC1;
+  PLL1feed();
+}
+
+void setCCLKDiv(uint8_t div) {
+  LPC_SC->CCLKCFG=CCLK_DIV(div);
+}
+
+void enableMainOsc() {
+  LPC_SC->SCS=OSCEN;
+  while(!(LPC_SC->SCS&OSCSTAT));
+}
+
+void disableMainOsc() {
+  LPC_SC->SCS=0;
+}
+
+void PLL0feed() {
+  LPC_SC->PLL0FEED=0xaa;
+  LPC_SC->PLL0FEED=0x55;
+}
+
+void PLL1feed() {
+  LPC_SC->PLL1FEED=0xaa;
+  LPC_SC->PLL1FEED=0x55;
+}
+
+void setClkSrc(uint8_t src) {
+  LPC_SC->CLKSRCSEL=src;
 }
--- a/src/clock.h
+++ b/src/clock.h
@ -8,6 +8,9 @@
 #define PLLE0           (1<<0)
 #define PLLC0           (1<<1)
 #define PLOCK0          (1<<26)
+#define PLLE1           (1<<0)
+#define PLLC1           (1<<1)
+#define PLOCK1          (1<<10)
 #define OSCEN           (1<<5)
 #define OSCSTAT         (1<<6)
 #define FLASHTIM(x)     (((x-1)<<12)|0x3A)
@ -49,29 +52,31 @@
 #define PCLK_SYSCON	(28)
 #define PCLK_MC		(30)

-void clock_disconnect( void );
+void clock_disconnect(void);

-void clock_init( void );
+void clock_init(void);

-void setFlashAccessTime( uint8_t clocks );
+void setFlashAccessTime(uint8_t clocks);

-void setPLL0MultPrediv( uint16_t mult, uint8_t prediv );
+void setPLL0MultPrediv(uint16_t mult, uint8_t prediv);
+void enablePLL0(void);
+void disablePLL0(void);
+void connectPLL0(void);
+void disconnectPLL0(void);
+void PLL0feed(void);

-void enablePLL0( void );
+void setPLL1MultPrediv(uint16_t mult, uint8_t prediv);
+void enablePLL1(void);
+void disablePLL1(void);
+void connectPLL1(void);
+void disconnectPLL1(void);
+void PLL1feed(void);

-void disablePLL0( void );
+void setCCLKDiv(uint8_t div);

-void connectPLL0( void );
+void enableMainOsc(void);

-void disconnectPLL0( void );
+void disableMainOsc(void);

-void setCCLKDiv( uint8_t div );
-
-void enableMainOsc( void );
-
-void disableMainOsc( void );
-
-void PLL0feed( void );
-
-void setClkSrc( uint8_t src );
+void setClkSrc(uint8_t src);
 #endif
--- a/src/config.h
+++ b/src/config.h
@ -96,4 +96,7 @@

 #define SD_DAT (LPC_GPIO2->FIOPIN0)

+#define USB_CONNREG LPC_GPIO4
+#define USB_CONNBIT 28
+
 #endif
--- a/src/crc.h
+++ b/src/crc.h
@ -1,9 +1,9 @@
 #ifndef CRC_H
 #define CRC_H

-uint8_t crc7update( uint8_t crc, uint8_t data );
-uint16_t crc_xmodem_update( uint16_t crc, uint8_t data );
-uint16_t crc_xmodem_block( uint16_t crc, const uint8_t *data, uint32_t length );
+uint8_t crc7update(uint8_t crc, uint8_t data);
+uint16_t crc_xmodem_update(uint16_t crc, uint8_t data);
+uint16_t crc_xmodem_block(uint16_t crc, const uint8_t *data, uint32_t length);

 // AVR-libc compatibility
 #define _crc_xmodem_update(crc,data) crc_xmodem_update(crc,data)
--- a/src/crc16.c
+++ b/src/crc16.c
@ -20,8 +20,7 @@
 /**
 * Static table used for the table_driven implementation.
 *****************************************************************************/
-static const uint16_t crc_table[256] =
-{
+static const uint16_t crc_table[256] = {
    0x0000, 0xc0c1, 0xc181, 0x0140, 0xc301, 0x03c0, 0x0280, 0xc241,
    0xc601, 0x06c0, 0x0780, 0xc741, 0x0500, 0xc5c1, 0xc481, 0x0440,
    0xcc01, 0x0cc0, 0x0d80, 0xcd41, 0x0f00, 0xcfc1, 0xce81, 0x0e40,
@ -64,11 +63,11 @@ static const uint16_t crc_table[256] =
 * \param data_len Number of bytes in the \a data buffer.
 * \return         The updated crc value.
 *****************************************************************************/
-uint16_t crc16_update( uint16_t crc, const unsigned char data )
+uint16_t crc16_update(uint16_t crc, const unsigned char data)
 {
  unsigned int tbl_idx;
-    tbl_idx = ( crc ^ data ) & 0xff;
-    crc = ( crc_table[tbl_idx] ^ ( crc >> 8 ) ) & 0xffff;
+  tbl_idx = (crc ^ data) & 0xff;
+  crc = (crc_table[tbl_idx] ^ (crc >> 8)) & 0xffff;
  return crc & 0xffff;
 }

--- a/src/crc16.h
+++ b/src/crc16.h
@ -37,7 +37,7 @@ extern "C" {
 * \param data_len Number of bytes in the \a data buffer.
 * \return         The updated crc value.
 *****************************************************************************/
-uint16_t crc16_update( uint16_t crc, const unsigned char data );
+uint16_t crc16_update(uint16_t crc, const unsigned char data);

 #ifdef __cplusplus
 }           /* closing brace for extern "C" */
--- a/src/crc32.c
+++ b/src/crc32.c
@ -22,8 +22,7 @@
 /**
 * Static table used for the table_driven implementation.
 *****************************************************************************/
-static const uint32_t crc32_table[256] =
-{
+static const uint32_t crc32_table[256] = {
  0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
  0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
  0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
@ -98,12 +97,12 @@ static const uint32_t crc32_table[256] =
 * \param data_len Number of bytes in the \a data buffer.
 * \return         The updated crc value.
 *****************************************************************************/
-uint32_t crc32_update( uint32_t crc, const unsigned char data )
+uint32_t crc32_update(uint32_t crc, const unsigned char data)
 {
  unsigned int tbl_idx;

-    tbl_idx = ( crc ^ data ) & 0xff;
-    crc = ( crc32_table[tbl_idx] ^ ( crc >> 8 ) ) & 0xffffffff;
+  tbl_idx = (crc ^ data) & 0xff;
+  crc = (crc32_table[tbl_idx] ^ (crc >> 8)) & 0xffffffff;

  return crc & 0xffffffff;
 }
--- a/src/crc32.h
+++ b/src/crc32.h
@ -34,7 +34,7 @@ extern "C" {
 *
 * \return     The initial crc value.
 *****************************************************************************/
-static inline uint32_t crc_init( void )
+static inline uint32_t crc_init(void)
 {
  return 0xffffffff;
 }
@ -47,7 +47,7 @@ static inline uint32_t crc_init( void )
 * \param data_len Number of bytes in the \a data buffer.
 * \return         The updated crc value.
 *****************************************************************************/
-uint32_t crc32_update( uint32_t crc, const unsigned char data );
+uint32_t crc32_update(uint32_t crc, const unsigned char data);

 /**
 * Calculate the final crc value.
@ -55,7 +55,7 @@ uint32_t crc32_update( uint32_t crc, const unsigned char data );
 * \param crc  The current crc value.
 * \return     The final crc value.
 *****************************************************************************/
-static inline uint32_t crc32_finalize( uint32_t crc )
+static inline uint32_t crc32_finalize(uint32_t crc)
 {
  return crc ^ 0xffffffff;
 }
--- a/src/diskio.h
+++ b/src/diskio.h
@ -16,8 +16,7 @@
 typedef BYTE	DSTATUS;

 /* Results of Disk Functions */
-typedef enum
-{
+typedef enum {
 	RES_OK = 0,		/* 0: Successful */
 	RES_ERROR,		/* 1: R/W Error */
 	RES_WRPRT,		/* 2: Write Protected */
@ -36,8 +35,7 @@ typedef enum
 * This is the struct returned in the data buffer when disk_getinfo
 * is called with page=0.
 */
-typedef struct
-{
+typedef struct {
  uint8_t  validbytes;
  uint8_t  maxpage;
  uint8_t  disktype;
@ -50,16 +48,16 @@ typedef struct
 /*---------------------------------------*/
 /* Prototypes for disk control functions */

-int assign_drives ( int, int );
-DSTATUS disk_initialize ( BYTE );
-DSTATUS disk_status ( BYTE );
-DRESULT disk_read ( BYTE, BYTE *, DWORD, BYTE );
+int assign_drives (int, int);
+DSTATUS disk_initialize (BYTE);
+DSTATUS disk_status (BYTE);
+DRESULT disk_read (BYTE, BYTE*, DWORD, BYTE);
 #if	_READONLY == 0
-DRESULT disk_write ( BYTE, const BYTE *, DWORD, BYTE );
+DRESULT disk_write (BYTE, const BYTE*, DWORD, BYTE);
 #endif
-DRESULT disk_ioctl ( BYTE, BYTE, void * );
+DRESULT disk_ioctl (BYTE, BYTE, void*);

-void disk_init( void );
+void disk_init(void);

 /* Will be set to DISK_ERROR if any access on the card fails */
 enum diskstates { DISK_CHANGED = 0, DISK_REMOVED, DISK_OK, DISK_ERROR };
--- a/src/faulthandler.c
+++ b/src/faulthandler.c
@ -1,25 +1,20 @@
 #include <arm/NXP/LPC17xx/LPC17xx.h>
 #include "uart.h"

-void HardFault_Handler( void )
-{
-    printf( "HFSR: %lx\n", SCB->HFSR );
-
-    while ( 1 ) ;
+void HardFault_Handler(void) {
+  printf("HFSR: %lx\n", SCB->HFSR);
+  while (1) ;
 }

-void MemManage_Handler( void )
-{
-    printf( "MemManage - CFSR: %lx; MMFAR: %lx\n", SCB->CFSR, SCB->MMFAR );
+void MemManage_Handler(void) {
+  printf("MemManage - CFSR: %lx; MMFAR: %lx\n", SCB->CFSR, SCB->MMFAR);
 }

-void BusFault_Handler( void )
-{
-    printf( "BusFault - CFSR: %lx; BFAR: %lx\n", SCB->CFSR, SCB->BFAR );
+void BusFault_Handler(void) {
+  printf("BusFault - CFSR: %lx; BFAR: %lx\n", SCB->CFSR, SCB->BFAR);
 }

-void UsageFault_Handler( void )
-{
-    printf( "UsageFault - CFSR: %lx; BFAR: %lx\n", SCB->CFSR, SCB->BFAR );
+void UsageFault_Handler(void) {
+  printf("UsageFault - CFSR: %lx; BFAR: %lx\n", SCB->CFSR, SCB->BFAR);
 }

--- a/src/ff.c
+++ b/src/ff.c
--- a/src/ff.h
+++ b/src/ff.h
@ -229,8 +229,7 @@ extern "C" {
 #if _MULTI_PARTITION		/* Multiple partition configuration */
 #define LD2PD(vol) (VolToPart[vol].pd)	/* Get physical drive# */
 #define LD2PT(vol) (VolToPart[vol].pt)	/* Get partition# */
-typedef struct
-{
+typedef struct {
 	BYTE pd;	/* Physical drive# */
 	BYTE pt;	/* Partition # (0-3) */
 } PARTITION;
@ -269,8 +268,7 @@ typedef char TCHAR;

 /* File system object structure (FATFS) */

-typedef struct
-{
+typedef struct {
 	BYTE	fs_type;		/* FAT sub-type (0:Not mounted) */
 	BYTE	drv;			/* Physical drive number */
 	BYTE	csize;			/* Sectors per cluster (1,2,4...128) */
@ -306,9 +304,8 @@ typedef struct

 /* File object structure (FIL) */

-typedef struct
-{
-    FATFS  *fs;             /* Pointer to the owner file system object */
+typedef struct {
+	FATFS*	fs;				/* Pointer to the owner file system object */
 	WORD	id;				/* Owner file system mount ID */
 	BYTE	flag;			/* File status flags */
 	BYTE	pad1;
@ -319,10 +316,10 @@ typedef struct
 	DWORD	dsect;			/* Current data sector */
 #if !_FS_READONLY
 	DWORD	dir_sect;		/* Sector containing the directory entry */
-    BYTE   *dir_ptr;        /* Ponter to the directory entry in the window */
+	BYTE*	dir_ptr;		/* Ponter to the directory entry in the window */
 #endif
 #if _USE_FASTSEEK
-    DWORD  *cltbl;          /* Pointer to the cluster link map table (null on file open) */
+	DWORD*	cltbl;			/* Pointer to the cluster link map table (null on file open) */
 #endif
 #if _FS_SHARE
 	UINT	lockid;			/* File lock ID (index of file semaphore table) */
@ -336,18 +333,17 @@ typedef struct

 /* Directory object structure (DIR) */

-typedef struct
-{
-    FATFS  *fs;             /* Pointer to the owner file system object */
+typedef struct {
+	FATFS*	fs;				/* Pointer to the owner file system object */
 	WORD	id;				/* Owner file system mount ID */
 	WORD	index;			/* Current read/write index number */
 	DWORD	sclust;			/* Table start cluster (0:Root dir) */
 	DWORD	clust;			/* Current cluster */
 	DWORD	sect;			/* Current sector */
-    BYTE   *dir;            /* Pointer to the current SFN entry in the win[] */
-    BYTE   *fn;             /* Pointer to the SFN (in/out) {file[8],ext[3],status[1]} */
+	BYTE*	dir;			/* Pointer to the current SFN entry in the win[] */
+	BYTE*	fn;				/* Pointer to the SFN (in/out) {file[8],ext[3],status[1]} */
 #if _USE_LFN
-    WCHAR  *lfn;            /* Pointer to the LFN working buffer */
+	WCHAR*	lfn;			/* Pointer to the LFN working buffer */
 	WORD	lfn_idx;		/* Last matched LFN index number (0xFFFF:No LFN) */
 #endif
 } DIR;
@ -356,8 +352,7 @@ typedef struct

 /* File status structure (FILINFO) */

-typedef struct
-{
+typedef struct {
 	DWORD	fsize;			/* File size */
 	WORD	fdate;			/* Last modified date */
 	WORD	ftime;			/* Last modified time */
@ -365,7 +360,7 @@ typedef struct
 	TCHAR	fname[13];		/* Short file name (8.3 format) */
 	DWORD	clust;			/* start cluster */
 #if _USE_LFN
-    TCHAR  *lfname;         /* Pointer to the LFN buffer */
+	TCHAR*	lfname;			/* Pointer to the LFN buffer */
 	UINT 	lfsize;			/* Size of LFN buffer in TCHAR */
 #endif
 } FILINFO;
@ -374,8 +369,7 @@ typedef struct

 /* File function return code (FRESULT) */

-typedef enum
-{
+typedef enum {
 	FR_OK = 0,				/* (0) Succeeded */
 	FR_DISK_ERR,			/* (1) A hard error occured in the low level disk I/O layer */
 	FR_INT_ERR,				/* (2) Assertion failed */
@ -403,51 +397,50 @@ typedef enum
 /* FatFs module application interface                           */

 /* Low Level functions */
-FRESULT l_openfilebycluster( FATFS *fs, FIL *fp, const TCHAR *path, DWORD clust,
-                             DWORD fsize ); /* Open a file by its start cluster using supplied file size */
-FRESULT l_opendirbycluster ( FATFS *fs, DIR *dj, const TCHAR *path, DWORD clust );
+FRESULT l_openfilebycluster(FATFS *fs, FIL *fp, const TCHAR *path, DWORD clust, DWORD fsize);   /* Open a file by its start cluster using supplied file size */
+FRESULT l_opendirbycluster (FATFS *fs, DIR *dj, const TCHAR *path, DWORD clust);

 /* application level functions */
-FRESULT f_mount ( BYTE, FATFS * );                  /* Mount/Unmount a logical drive */
-FRESULT f_open ( FIL *, const TCHAR *, BYTE );      /* Open or create a file */
-FRESULT f_read ( FIL *, void *, UINT, UINT * );     /* Read data from a file */
-FRESULT f_lseek ( FIL *, DWORD );                   /* Move file pointer of a file object */
-FRESULT f_close ( FIL * );                          /* Close an open file object */
-FRESULT f_opendir ( DIR *, const TCHAR * );         /* Open an existing directory */
-FRESULT f_readdir ( DIR *, FILINFO * );             /* Read a directory item */
-FRESULT f_stat ( const TCHAR *, FILINFO * );        /* Get file status */
+FRESULT f_mount (BYTE, FATFS*);						/* Mount/Unmount a logical drive */
+FRESULT f_open (FIL*, const TCHAR*, BYTE);			/* Open or create a file */
+FRESULT f_read (FIL*, void*, UINT, UINT*);			/* Read data from a file */
+FRESULT f_lseek (FIL*, DWORD);						/* Move file pointer of a file object */
+FRESULT f_close (FIL*);								/* Close an open file object */
+FRESULT f_opendir (DIR*, const TCHAR*);				/* Open an existing directory */
+FRESULT f_readdir (DIR*, FILINFO*);					/* Read a directory item */
+FRESULT f_stat (const TCHAR*, FILINFO*);			/* Get file status */

 #if !_FS_READONLY
-FRESULT f_write ( FIL *, const void *, UINT, UINT * ); /* Write data to a file */
-FRESULT f_getfree ( const TCHAR *, DWORD *, FATFS ** ); /* Get number of free clusters on the drive */
-FRESULT f_truncate ( FIL * );                       /* Truncate file */
-FRESULT f_sync ( FIL * );                           /* Flush cached data of a writing file */
-FRESULT f_unlink ( const TCHAR * );                 /* Delete an existing file or directory */
-FRESULT f_mkdir ( const TCHAR * );                  /* Create a new directory */
-FRESULT f_chmod ( const TCHAR *, BYTE, BYTE );      /* Change attriburte of the file/dir */
-FRESULT f_utime ( const TCHAR *, const FILINFO * ); /* Change timestamp of the file/dir */
-FRESULT f_rename ( const TCHAR *, const TCHAR * );  /* Rename/Move a file or directory */
+FRESULT f_write (FIL*, const void*, UINT, UINT*);	/* Write data to a file */
+FRESULT f_getfree (const TCHAR*, DWORD*, FATFS**);	/* Get number of free clusters on the drive */
+FRESULT f_truncate (FIL*);							/* Truncate file */
+FRESULT f_sync (FIL*);								/* Flush cached data of a writing file */
+FRESULT f_unlink (const TCHAR*);					/* Delete an existing file or directory */
+FRESULT	f_mkdir (const TCHAR*);						/* Create a new directory */
+FRESULT f_chmod (const TCHAR*, BYTE, BYTE);			/* Change attriburte of the file/dir */
+FRESULT f_utime (const TCHAR*, const FILINFO*);		/* Change timestamp of the file/dir */
+FRESULT f_rename (const TCHAR*, const TCHAR*);		/* Rename/Move a file or directory */
 #endif

 #if _USE_FORWARD
-FRESULT f_forward ( FIL *, UINT( * )( const BYTE *, UINT ), UINT, UINT * ); /* Forward data to the stream */
+FRESULT f_forward (FIL*, UINT(*)(const BYTE*,UINT), UINT, UINT*);	/* Forward data to the stream */
 #endif

 #if _USE_MKFS
-FRESULT f_mkfs ( BYTE, BYTE, UINT );                /* Create a file system on the drive */
+FRESULT f_mkfs (BYTE, BYTE, UINT);					/* Create a file system on the drive */
 #endif

 #if _FS_RPATH
-FRESULT f_chdrive ( BYTE );                         /* Change current drive */
-FRESULT f_chdir ( const TCHAR * );                  /* Change current directory */
-FRESULT f_getcwd ( TCHAR *, UINT );                 /* Get current directory */
+FRESULT f_chdrive (BYTE);							/* Change current drive */
+FRESULT f_chdir (const TCHAR*);						/* Change current directory */
+FRESULT f_getcwd (TCHAR*, UINT);					/* Get current directory */
 #endif

 #if _USE_STRFUNC
-int f_putc ( TCHAR, FIL * );                        /* Put a character to the file */
-int f_puts ( const TCHAR *, FIL * );                /* Put a string to the file */
-int f_printf ( FIL *, const TCHAR *, ... );         /* Put a formatted string to the file */
-TCHAR *f_gets ( TCHAR *, int, FIL * );              /* Get a string from the file */
+int f_putc (TCHAR, FIL*);							/* Put a character to the file */
+int f_puts (const TCHAR*, FIL*);					/* Put a string to the file */
+int f_printf (FIL*, const TCHAR*, ...);				/* Put a formatted string to the file */
+TCHAR* f_gets (TCHAR*, int, FIL*);					/* Get a string from the file */
 #ifndef EOF
 #define EOF (-1)
 #endif
@ -465,25 +458,25 @@ TCHAR *f_gets ( TCHAR *, int, FIL * );              /* Get a string from the fil

 /* RTC function */
 #if !_FS_READONLY
-DWORD get_fattime ( void );
+DWORD get_fattime (void);
 #endif

 /* Unicode support functions */
 #if _USE_LFN						/* Unicode - OEM code conversion */
-WCHAR ff_convert ( WCHAR, UINT );   /* OEM-Unicode bidirectional conversion */
-WCHAR ff_wtoupper ( WCHAR );        /* Unicode upper-case conversion */
+WCHAR ff_convert (WCHAR, UINT);		/* OEM-Unicode bidirectional conversion */
+WCHAR ff_wtoupper (WCHAR);			/* Unicode upper-case conversion */
 #if _USE_LFN == 3					/* Memory functions */
-void *ff_memalloc ( UINT );         /* Allocate memory block */
-void ff_memfree ( void * );         /* Free memory block */
+void* ff_memalloc (UINT);			/* Allocate memory block */
+void ff_memfree (void*);			/* Free memory block */
 #endif
 #endif

 /* Sync functions */
 #if _FS_REENTRANT
-int ff_cre_syncobj ( BYTE, _SYNC_t * ); /* Create a sync object */
-int ff_del_syncobj ( _SYNC_t );     /* Delete a sync object */
-int ff_req_grant ( _SYNC_t );       /* Lock sync object */
-void ff_rel_grant ( _SYNC_t );      /* Unlock sync object */
+int ff_cre_syncobj (BYTE, _SYNC_t*);/* Create a sync object */
+int ff_del_syncobj (_SYNC_t);		/* Delete a sync object */
+int ff_req_grant (_SYNC_t);			/* Lock sync object */
+void ff_rel_grant (_SYNC_t);		/* Unlock sync object */
 #endif


--- a/src/fileops.c
+++ b/src/fileops.c
@ -37,113 +37,81 @@ WCHAR ff_convert(WCHAR w, UINT dir) {

 int newcard;

-void file_init()
-{
-    file_res = f_mount( 0, &fatfs );
+void file_init() {
+  file_res=f_mount(0, &fatfs);
  newcard = 0;
 }

-void file_reinit( void )
-{
+void file_reinit(void) {
  disk_init();
  file_init();
 }

-FRESULT dir_open_by_filinfo( DIR *dir, FILINFO *fno )
-{
-    return l_opendirbycluster( &fatfs, dir, ( TCHAR * )"", fno->clust );
+FRESULT dir_open_by_filinfo(DIR* dir, FILINFO* fno) {
+  return l_opendirbycluster(&fatfs, dir, (TCHAR*)"", fno->clust);
 }

-void file_open_by_filinfo( FILINFO *fno )
-{
-    file_res = l_openfilebycluster( &fatfs, &file_handle, ( TCHAR * )"", fno->clust, fno->fsize );
+void file_open_by_filinfo(FILINFO* fno) {
+  file_res = l_openfilebycluster(&fatfs, &file_handle, (TCHAR*)"", fno->clust, fno->fsize);
 }

-void file_open( const uint8_t *filename, BYTE flags )
-{
-    if ( disk_state == DISK_CHANGED )
-    {
+void file_open(const uint8_t* filename, BYTE flags) {
+  if (disk_state == DISK_CHANGED) {
    file_reinit();
    newcard = 1;
  }
-
-    file_res = f_open( &file_handle, ( TCHAR * )filename, flags );
-    file_block_off = sizeof( file_buf );
-    file_block_max = sizeof( file_buf );
+  file_res = f_open(&file_handle, (TCHAR*)filename, flags);
+  file_block_off = sizeof(file_buf);
+  file_block_max = sizeof(file_buf);
  file_status = file_res ? FILE_ERR : FILE_OK;
 }

-void file_close()
-{
-    file_res = f_close( &file_handle );
+void file_close() {
+  file_res = f_close(&file_handle);
 }

-void file_seek( uint32_t offset )
-{
-    file_res = f_lseek( &file_handle, ( DWORD )offset );
+void file_seek(uint32_t offset) {
+  file_res = f_lseek(&file_handle, (DWORD)offset);
 }

-UINT file_read()
-{
+UINT file_read() {
  UINT bytes_read;
-    file_res = f_read( &file_handle, file_buf, sizeof( file_buf ), &bytes_read );
+  file_res = f_read(&file_handle, file_buf, sizeof(file_buf), &bytes_read);
  return bytes_read;
 }

-UINT file_write()
-{
+UINT file_write() {
  UINT bytes_written;
-    file_res = f_write( &file_handle, file_buf, sizeof( file_buf ), &bytes_written );
-
-    if ( bytes_written < sizeof( file_buf ) )
-    {
-        printf( "wrote less than expected - card full?\n" );
+  file_res = f_write(&file_handle, file_buf, sizeof(file_buf), &bytes_written);
+  if(bytes_written < sizeof(file_buf)) {
+    printf("wrote less than expected - card full?\n");
  }
-
  return bytes_written;
 }

-UINT file_readblock( void *buf, uint32_t addr, uint16_t size )
-{
+UINT file_readblock(void* buf, uint32_t addr, uint16_t size) {
  UINT bytes_read;
-    file_res = f_lseek( &file_handle, addr );
-
-    if ( file_handle.fptr != addr )
-    {
+  file_res = f_lseek(&file_handle, addr);
+  if(file_handle.fptr != addr) {
    return 0;
  }
-
-    file_res = f_read( &file_handle, buf, size, &bytes_read );
+  file_res = f_read(&file_handle, buf, size, &bytes_read);
  return bytes_read;
 }

-UINT file_writeblock( void *buf, uint32_t addr, uint16_t size )
-{
+UINT file_writeblock(void* buf, uint32_t addr, uint16_t size) {
  UINT bytes_written;
-    file_res = f_lseek( &file_handle, addr );
-
-    if ( file_res )
-    {
-        return 0;
-    }
-
-    file_res = f_write( &file_handle, buf, size, &bytes_written );
+  file_res = f_lseek(&file_handle, addr);
+  if(file_res) return 0;
+  file_res = f_write(&file_handle, buf, size, &bytes_written);
  return bytes_written;
 }

-uint8_t file_getc()
-{
-    if ( file_block_off == file_block_max )
-    {
+uint8_t file_getc() {
+  if(file_block_off == file_block_max) {
    file_block_max = file_read();
-
-        if ( file_block_max == 0 )
-        {
-            file_status = FILE_EOF;
-        }
-
+    if(file_block_max == 0) file_status = FILE_EOF;
    file_block_off = 0;
  }
-
  return file_buf[file_block_off++];
 }
--- a/src/fileops.h
+++ b/src/fileops.h
@ -29,7 +29,7 @@
 #include <arm/NXP/LPC17xx/LPC17xx.h>
 #include "ff.h"

-enum filestates { FILE_OK = 0, FILE_ERR, FILE_EOF };
+enum filestates { FILE_OK=0, FILE_ERR, FILE_EOF };

 BYTE file_buf[512];
 FATFS fatfs;
@ -39,16 +39,16 @@ uint8_t file_lfn[258];
 uint16_t file_block_off, file_block_max;
 enum filestates file_status;

-void file_init( void );
-void file_open( const uint8_t *filename, BYTE flags );
-FRESULT dir_open_by_filinfo( DIR *dir, FILINFO *fno_param );
-void file_open_by_filinfo( FILINFO *fno );
-void file_close( void );
-void file_seek( uint32_t offset );
-UINT file_read( void );
-UINT file_write( void );
-UINT file_readblock( void *buf, uint32_t addr, uint16_t size );
-UINT file_writeblock( void *buf, uint32_t addr, uint16_t size );
+void file_init(void);
+void file_open(const uint8_t* filename, BYTE flags);
+FRESULT dir_open_by_filinfo(DIR* dir, FILINFO* fno_param);
+void file_open_by_filinfo(FILINFO* fno);
+void file_close(void);
+void file_seek(uint32_t offset);
+UINT file_read(void);
+UINT file_write(void);
+UINT file_readblock(void* buf, uint32_t addr, uint16_t size);
+UINT file_writeblock(void* buf, uint32_t addr, uint16_t size);

-uint8_t file_getc( void );
+uint8_t file_getc(void);
 #endif
--- a/src/filetypes.c
+++ b/src/filetypes.c
@ -36,47 +36,36 @@
 #include "led.h"
 #include "sort.h"

-uint16_t scan_flat( const char *path )
-{
+uint16_t scan_flat(const char* path) {
  DIR dir;
  FRESULT res;
  FILINFO fno;
  fno.lfname = NULL;
-    res = f_opendir( &dir, ( TCHAR * )path );
+  res = f_opendir(&dir, (TCHAR*)path);
  uint16_t numentries = 0;
-
-    if ( res == FR_OK )
-    {
-        for ( ;; )
-        {
-            res = f_readdir( &dir, &fno );
-
-            if ( res != FR_OK || fno.fname[0] == 0 )
-            {
-                break;
-            }
-
+  if (res == FR_OK) {
+    for (;;) {
+      res = f_readdir(&dir, &fno);
+      if(res != FR_OK || fno.fname[0] == 0)break;
      numentries++;
    }
  }
-
  return numentries;
 }

-uint32_t scan_dir( char *path, FILINFO *fno_param, char mkdb, uint32_t this_dir_tgt )
-{
+uint32_t scan_dir(char* path, FILINFO* fno_param, char mkdb, uint32_t this_dir_tgt) {
  DIR dir;
  FILINFO fno;
  FRESULT res;
  uint8_t len;
-    TCHAR *fn;
+  TCHAR* fn;
  static unsigned char depth = 0;
  static uint32_t crc, fncrc;
  static uint32_t db_tgt;
  static uint32_t next_subdir_tgt;
  static uint32_t parent_tgt;
  static uint32_t dir_end = 0;
-    static uint8_t was_empty = 0;
+/*  static uint8_t was_empty = 0;*/
  static uint16_t num_files_total = 0;
  static uint16_t num_dirs_total = 0;
  uint32_t dir_tgt;
@ -91,373 +80,257 @@ uint32_t scan_dir( char *path, FILINFO *fno_param, char mkdb, uint32_t this_dir_
  uint16_t entrycnt;

  dir_tgt = this_dir_tgt;
-
-    if ( depth == 0 )
-    {
+  if(depth==0) {
    crc = 0;
-        db_tgt = SRAM_DB_ADDR + 0x10;
+    db_tgt = SRAM_DB_ADDR+0x10;
    dir_tgt = SRAM_DIR_ADDR;
    next_subdir_tgt = SRAM_DIR_ADDR;
    this_dir_tgt = SRAM_DIR_ADDR;
    parent_tgt = 0;
-        printf( "root dir @%lx\n", dir_tgt );
+    printf("root dir @%lx\n", dir_tgt);
  }

  fno.lfsize = 255;
-    fno.lfname = ( TCHAR * )file_lfn;
-    numentries = 0;
-
-    for ( pass = 0; pass < ( mkdb ? 2 : 1 ); pass++ )
-    {
-        if ( pass )
-        {
-            dirsize = 4 * ( numentries );
-
-            if ( ( ( next_subdir_tgt + dirsize + 8 ) & 0xff0000 ) > ( next_subdir_tgt & 0xff0000 ) )
-            {
-                printf( "switchdir! old=%lX ", next_subdir_tgt + dirsize + 4 );
+  fno.lfname = (TCHAR*)file_lfn;
+  numentries=0;
+  for(pass = 0; pass < (mkdb ? 2 : 1); pass++) {
+    if(pass) {
+      dirsize = 4*(numentries);
+      if(((next_subdir_tgt + dirsize + 8) & 0xff0000) > (next_subdir_tgt & 0xff0000)) {
+        printf("switchdir! old=%lX ", next_subdir_tgt + dirsize + 4);
        next_subdir_tgt &= 0xffff0000;
        next_subdir_tgt += 0x00010004;
-                printf( "new=%lx\n", next_subdir_tgt );
+        printf("new=%lx\n", next_subdir_tgt);
        dir_tgt &= 0xffff0000;
        dir_tgt += 0x00010004;
      }
-
      switched_dir_tgt = dir_tgt;
      next_subdir_tgt += dirsize + 4;
-
-            if ( parent_tgt )
-            {
-                next_subdir_tgt += 4;
-            }
-
-            if ( next_subdir_tgt > dir_end )
-            {
+      if(parent_tgt) next_subdir_tgt += 4;
+      if(next_subdir_tgt > dir_end) {
        dir_end = next_subdir_tgt;
      }
-
-            DBG_FS printf( "path=%s depth=%d ptr=%lx entries=%d parent=%lx next subdir @%lx\n", path, depth, db_tgt, numentries,
-                           parent_tgt, next_subdir_tgt );
-
-            if ( mkdb )
-            {
+      DBG_FS printf("path=%s depth=%d ptr=%lx entries=%d parent=%lx next subdir @%lx\n", path, depth, db_tgt, numentries, parent_tgt, next_subdir_tgt);
+      if(mkdb) {
        num_dirs_total++;
-                //        printf("d=%d Saving %lx to Address %lx  [end]\n", depth, 0L, next_subdir_tgt - 4);
-                sram_writelong( 0L, next_subdir_tgt - 4 );
+//        printf("d=%d Saving %lx to Address %lx  [end]\n", depth, 0L, next_subdir_tgt - 4);
+        sram_writelong(0L, next_subdir_tgt - 4);
      }
    }
-
-        if ( fno_param )
-        {
-            res = dir_open_by_filinfo( &dir, fno_param );
+    if(fno_param) {
+      res = dir_open_by_filinfo(&dir, fno_param);
+    } else {
+      res = f_opendir(&dir, path);
    }
-        else
-        {
-            res = f_opendir( &dir, path );
-        }
-
-        if ( res == FR_OK )
-        {
-            if ( pass && parent_tgt && mkdb )
-            {
+    if (res == FR_OK) {
+      if(pass && parent_tgt && mkdb) {
        /* write backlink to parent dir
           switch to next bank if record does not fit in current bank */
-                if ( ( db_tgt & 0xffff ) > ( ( 0x10000 - ( sizeof( next_subdir_tgt ) + sizeof( len ) + 4 ) ) & 0xffff ) )
-                {
-                    printf( "switch! old=%lx ", db_tgt );
+        if((db_tgt&0xffff) > ((0x10000-(sizeof(next_subdir_tgt)+sizeof(len)+4))&0xffff)) {
+          printf("switch! old=%lx ", db_tgt);
          db_tgt &= 0xffff0000;
          db_tgt += 0x00010000;
-                    printf( "new=%lx\n", db_tgt );
+          printf("new=%lx\n", db_tgt);
        }
-
-                //        printf("writing link to parent, %lx to address %lx [../]\n", parent_tgt-SRAM_MENU_ADDR, db_tgt);
-                sram_writelong( ( parent_tgt - SRAM_MENU_ADDR ), db_tgt );
-                sram_writebyte( 0, db_tgt + sizeof( next_subdir_tgt ) );
-                sram_writeblock( "../\0", db_tgt + sizeof( next_subdir_tgt ) + sizeof( len ), 4 );
-                sram_writelong( ( db_tgt - SRAM_MENU_ADDR ) | ( ( uint32_t )0x81 << 24 ), dir_tgt );
-                db_tgt += sizeof( next_subdir_tgt ) + sizeof( len ) + 4;
+//        printf("writing link to parent, %lx to address %lx [../]\n", parent_tgt-SRAM_MENU_ADDR, db_tgt);
+        sram_writelong((parent_tgt-SRAM_MENU_ADDR), db_tgt);
+        sram_writebyte(0, db_tgt+sizeof(next_subdir_tgt));
+        sram_writeblock("../\0", db_tgt+sizeof(next_subdir_tgt)+sizeof(len), 4);
+        sram_writelong((db_tgt-SRAM_MENU_ADDR)|((uint32_t)0x81<<24), dir_tgt);
+        db_tgt += sizeof(next_subdir_tgt)+sizeof(len)+4;
        dir_tgt += 4;
      }
-
-            len = strlen( ( char * )path );
-
+      len = strlen((char*)path);
      /* scan at most DIR_FILE_MAX entries per directory */
-            for ( entrycnt = 0; entrycnt < DIR_FILE_MAX; entrycnt++ )
-            {
-                //        toggle_read_led();
-                res = f_readdir( &dir, &fno );
-
-                if ( res != FR_OK || fno.fname[0] == 0 )
-                {
-                    if ( pass )
-                    {
-                        /*            if(!numentries) was_empty=1;*/
+      for(entrycnt=0; entrycnt < DIR_FILE_MAX; entrycnt++) {
+//        toggle_read_led();
+        res = f_readdir(&dir, &fno);
+        if (res != FR_OK || fno.fname[0] == 0) {
+          if(pass) {
+/*            if(!numentries) was_empty=1;*/
          }
-
          break;
        }
-
        fn = *fno.lfname ? fno.lfname : fno.fname;
-
-                if ( ( *fn == '.' ) || !( strncasecmp( fn, SYS_DIR_NAME, sizeof( SYS_DIR_NAME ) ) ) )
-                {
-                    continue;
-                }
-
-                if ( fno.fattrib & AM_DIR )
-                {
+        if ((*fn == '.') || !(strncasecmp(fn, SYS_DIR_NAME, strlen(SYS_DIR_NAME)+1))) continue;
+        if (fno.fattrib & AM_DIR) {
          depth++;
-
-                    if ( depth < FS_MAX_DEPTH )
-                    {
+          if(depth < FS_MAX_DEPTH) {
            numentries++;
-
-                        if ( pass && mkdb )
-                        {
-                            path[len] = '/';
-                            strncpy( path + len + 1, ( char * )fn, sizeof( fs_path ) - len );
+            if(pass && mkdb) {
+              path[len]='/';
+              strncpy(path+len+1, (char*)fn, sizeof(fs_path)-len);
              uint16_t pathlen = 0;
              uint32_t old_db_tgt = 0;
-
-                            if ( mkdb )
-                            {
-                                pathlen = strlen( path );
-                                DBG_FS printf( "d=%d Saving %lx to Address %lx  [dir]\n", depth, db_tgt, dir_tgt );
-
+              if(mkdb) {
+                pathlen = strlen(path);
+                DBG_FS printf("d=%d Saving %lx to Address %lx  [dir]\n", depth, db_tgt, dir_tgt);
                /* save element:
                   - path name
                   - pointer to sub dir structure */
-                                if ( ( db_tgt & 0xffff ) > ( ( 0x10000 - ( sizeof( next_subdir_tgt ) + sizeof( len ) + pathlen + 2 ) ) & 0xffff ) )
-                                {
-                                    printf( "switch! old=%lx ", db_tgt );
+                if((db_tgt&0xffff) > ((0x10000-(sizeof(next_subdir_tgt) + sizeof(len) + pathlen + 2))&0xffff)) {
+                  printf("switch! old=%lx ", db_tgt);
                  db_tgt &= 0xffff0000;
                  db_tgt += 0x00010000;
-                                    printf( "new=%lx\n", db_tgt );
+                  printf("new=%lx\n", db_tgt);
                }
-
                /* write element pointer to current dir structure */
-                                sram_writelong( ( db_tgt - SRAM_MENU_ADDR ) | ( ( uint32_t )0x80 << 24 ), dir_tgt );
+                sram_writelong((db_tgt-SRAM_MENU_ADDR)|((uint32_t)0x80<<24), dir_tgt);
                /* save element:
                   - path name
                   - pointer to sub dir structure
                   moved below */
                old_db_tgt = db_tgt;
-                                db_tgt += sizeof( next_subdir_tgt ) + sizeof( len ) + pathlen + 2;
+                db_tgt += sizeof(next_subdir_tgt) + sizeof(len) + pathlen + 2;
              }
-
              parent_tgt = this_dir_tgt;
              /* scan subdir before writing current dir element to account for bank switches */
-                            uint32_t corrected_subdir_tgt = scan_dir( path, &fno, mkdb, next_subdir_tgt );
-
-                            if ( mkdb )
-                            {
-                                DBG_FS printf( "    Saving dir descriptor to %lx tgt=%lx, path=%s\n", old_db_tgt, corrected_subdir_tgt, path );
-                                sram_writelong( ( corrected_subdir_tgt - SRAM_MENU_ADDR ), old_db_tgt );
-                                sram_writebyte( len + 1, old_db_tgt + sizeof( next_subdir_tgt ) );
-                                sram_writeblock( path, old_db_tgt + sizeof( next_subdir_tgt ) + sizeof( len ), pathlen );
-                                sram_writeblock( "/\0", old_db_tgt + sizeof( next_subdir_tgt ) + sizeof( len ) + pathlen, 2 );
+              uint32_t corrected_subdir_tgt = scan_dir(path, &fno, mkdb, next_subdir_tgt);
+              if(mkdb) {
+                DBG_FS printf("    Saving dir descriptor to %lx tgt=%lx, path=%s\n", old_db_tgt, corrected_subdir_tgt, path);
+                sram_writelong((corrected_subdir_tgt-SRAM_MENU_ADDR), old_db_tgt);
+                sram_writebyte(len+1, old_db_tgt+sizeof(next_subdir_tgt));
+                sram_writeblock(path, old_db_tgt+sizeof(next_subdir_tgt)+sizeof(len), pathlen);
+                sram_writeblock("/\0", old_db_tgt + sizeof(next_subdir_tgt) + sizeof(len) + pathlen, 2);
              }
-
              dir_tgt += 4;
-                            /*              was_empty = 0;*/
-                        }
-                        else if ( !mkdb )
-                        {
-                            path[len] = '/';
-                            strncpy( path + len + 1, ( char * )fn, sizeof( fs_path ) - len );
-                            scan_dir( path, &fno, mkdb, next_subdir_tgt );
+/*              was_empty = 0;*/
+            } else if(!mkdb) {
+              path[len]='/';
+              strncpy(path+len+1, (char*)fn, sizeof(fs_path)-len);
+              scan_dir(path, &fno, mkdb, next_subdir_tgt);
            }
          }
-
          depth--;
-                    path[len] = 0;
-                }
-                else
-                {
-                    SNES_FTYPE type = determine_filetype( ( char * )fn );
-
-                    if ( type != TYPE_UNKNOWN )
-                    {
+          path[len]=0;
+        } else {
+          SNES_FTYPE type = determine_filetype((char*)fn);
+          if(type != TYPE_UNKNOWN) {
            numentries++;
-
-                        if ( pass )
-                        {
-                            if ( mkdb )
-                            {
+            if(pass) {
+              if(mkdb) {
                num_files_total++;
-                                /*                snes_romprops_t romprops; */
-                                path[len] = '/';
-                                strncpy( path + len + 1, ( char * )fn, sizeof( fs_path ) - len );
-                                uint16_t pathlen = strlen( path );
-
-                                switch ( type )
-                                {
+/*                snes_romprops_t romprops; */
+                path[len]='/';
+                strncpy(path+len+1, (char*)fn, sizeof(fs_path)-len);
+                uint16_t pathlen = strlen(path);
+                switch(type) {
                  case TYPE_IPS:
                  case TYPE_SMC:
                  case TYPE_SPC:
                    /* write element pointer to current dir structure */
-                                    DBG_FS printf( "d=%d Saving %lX to Address %lX  [file %s]\n", depth, db_tgt, dir_tgt, path );
-
-                                    if ( ( db_tgt & 0xffff ) > ( ( 0x10000 - ( sizeof( len ) + pathlen + sizeof( buf ) - 1 + 1 ) ) & 0xffff ) )
-                                    {
-                                        printf( "switch! old=%lx ", db_tgt );
+                    DBG_FS printf("d=%d Saving %lX to Address %lX  [file %s]\n", depth, db_tgt, dir_tgt, path);
+                    if((db_tgt&0xffff) > ((0x10000-(sizeof(len) + pathlen + sizeof(buf)-1 + 1))&0xffff)) {
+                      printf("switch! old=%lx ", db_tgt);
                      db_tgt &= 0xffff0000;
                      db_tgt += 0x00010000;
-                                        printf( "new=%lx\n", db_tgt );
+                      printf("new=%lx\n", db_tgt);
                    }
-
-                                    sram_writelong( ( db_tgt - SRAM_MENU_ADDR ) | ( ( uint32_t )type << 24 ), dir_tgt );
+                    sram_writelong((db_tgt-SRAM_MENU_ADDR) | ((uint32_t)type << 24), dir_tgt);
                    dir_tgt += 4;
                    /* save element:
                        - index of last slash character
                        - file name
                        - file size */
-                                    /*                  sram_writeblock((uint8_t*)&romprops, db_tgt, sizeof(romprops)); */
+/*                  sram_writeblock((uint8_t*)&romprops, db_tgt, sizeof(romprops)); */
                    entry_fsize = fno.fsize;
                    entry_unit_idx = 0;
-
-                                    while ( entry_fsize > 9999 )
-                                    {
+                    while(entry_fsize > 9999) {
                      entry_fsize >>= 10;
                      entry_unit_idx++;
                    }
-
-                                    snprintf( buf, sizeof( buf ), "% 5ld", entry_fsize );
-                                    strncat( buf, size_units[entry_unit_idx], 1 );
-                                    sram_writeblock( buf, db_tgt, sizeof( buf ) - 1 );
-                                    sram_writebyte( len + 1, db_tgt + sizeof( buf ) - 1 );
-                                    sram_writeblock( path, db_tgt + sizeof( len ) + sizeof( buf ) - 1, pathlen + 1 );
-                                    //                    sram_writelong(fno.fsize, db_tgt + sizeof(len) + pathlen + 1);
-                                    db_tgt += sizeof( len ) + pathlen + sizeof( buf ) - 1 + 1;
+                    snprintf(buf, sizeof(buf), "% 5ld", entry_fsize);
+                    strncat(buf, size_units[entry_unit_idx], 1);
+                    sram_writeblock(buf, db_tgt, sizeof(buf)-1);
+                    sram_writebyte(len+1, db_tgt + sizeof(buf)-1);
+                    sram_writeblock(path, db_tgt + sizeof(len) + sizeof(buf)-1, pathlen + 1);
+//                    sram_writelong(fno.fsize, db_tgt + sizeof(len) + pathlen + 1);
+                    db_tgt += sizeof(len) + pathlen + sizeof(buf)-1 + 1;
                    break;
-
                  case TYPE_UNKNOWN:
                  default:
                   break;
                }
-
                path[len] = 0;
-                                /*              printf("%s ", path);
+/*              printf("%s ", path);
                _delay_ms(30); */
              }
-                        }
-                        else
-                        {
-                            TCHAR *fn2 = fn;
+            } else {
+              TCHAR* fn2 = fn;
              fncrc = 0;
-
-                            while ( *fn2 != 0 )
-                            {
-                                fncrc += crc_xmodem_update( fncrc, *( ( unsigned char * )fn2++ ) );
+              while(*fn2 != 0) {
+                fncrc += crc_xmodem_update(fncrc, *((unsigned char*)fn2++));
              }
-
              crc += fncrc;
            }
          }
        }
      }
+    } else uart_putc(0x30+res);
  }
-        else
-        {
-            uart_putc( 0x30 + res );
-        }
-    }
-
-    DBG_FS printf( "db_tgt=%lx dir_end=%lx\n", db_tgt, dir_end );
-    sram_writelong( db_tgt, SRAM_DB_ADDR + 4 );
-    sram_writelong( dir_end, SRAM_DB_ADDR + 8 );
-    sram_writeshort( num_files_total, SRAM_DB_ADDR + 12 );
-    sram_writeshort( num_dirs_total, SRAM_DB_ADDR + 14 );
-
-    if ( depth == 0 )
-    {
-        return crc;
-    }
-    else
-    {
-        return switched_dir_tgt;
-    }
-
+  DBG_FS printf("db_tgt=%lx dir_end=%lx\n", db_tgt, dir_end);
+  sram_writelong(db_tgt, SRAM_DB_ADDR+4);
+  sram_writelong(dir_end, SRAM_DB_ADDR+8);
+  sram_writeshort(num_files_total, SRAM_DB_ADDR+12);
+  sram_writeshort(num_dirs_total, SRAM_DB_ADDR+14);
+  if(depth==0) return crc;
+  else return switched_dir_tgt;
  return was_empty; // tricky!
 }


-SNES_FTYPE determine_filetype( char *filename )
-{
-    char *ext = strrchr( filename, '.' );
-
-    if ( ext == NULL )
-    {
+SNES_FTYPE determine_filetype(char* filename) {
+  char* ext = strrchr(filename, '.');
+  if(ext == NULL)
    return TYPE_UNKNOWN;
-    }
-
-    if (  ( !strcasecmp( ext + 1, "SMC" ) )
-            || ( !strcasecmp( ext + 1, "SFC" ) )
-            || ( !strcasecmp( ext + 1, "FIG" ) )
-            || ( !strcasecmp( ext + 1, "BS" ) )
-       )
-    {
+  if(  (!strcasecmp(ext+1, "SMC"))
+     ||(!strcasecmp(ext+1, "SFC"))
+     ||(!strcasecmp(ext+1, "FIG"))
+     ||(!strcasecmp(ext+1, "BS"))
+    ) {
    return TYPE_SMC;
  }
-
-    /*  if(  (!strcasecmp(ext+1, "IPS"))
+/*  if(  (!strcasecmp(ext+1, "IPS"))
     ||(!strcasecmp(ext+1, "UPS"))
    ) {
    return TYPE_IPS;
  }*/
-    if ( !strcasecmp( ext + 1, "SPC" ) )
-    {
+  if(!strcasecmp(ext+1, "SPC")) {
    return TYPE_SPC;
  }
-
  return TYPE_UNKNOWN;
 }

-FRESULT get_db_id( uint32_t *id )
-{
-    file_open( ( uint8_t * )"/sd2snes/sd2snes.db", FA_READ );
-
-    if ( file_res == FR_OK )
-    {
-        file_readblock( id, 0, 4 );
-        /* XXX */// *id=0xdead;
+FRESULT get_db_id(uint32_t* id) {
+  file_open((uint8_t*)"/sd2snes/sd2snes.db", FA_READ);
+  if(file_res == FR_OK) {
+    file_readblock(id, 0, 4);
+/* XXX */// *id=0xdead;
    file_close();
+  } else {
+    *id=0xdeadbeef;
  }
-    else
-    {
-        *id = 0xdeadbeef;
-    }
-
  return file_res;
 }

-int get_num_dirent( uint32_t addr )
-{
+int get_num_dirent(uint32_t addr) {
  int result = 0;
-
-    while ( sram_readlong( addr + result * 4 ) )
-    {
+  while(sram_readlong(addr+result*4)) {
    result++;
  }
-
  return result;
 }

-void sort_all_dir( uint32_t endaddr )
-{
+void sort_all_dir(uint32_t endaddr) {
  uint32_t entries = 0;
  uint32_t current_base = SRAM_DIR_ADDR;
-
-    while ( current_base < ( endaddr ) )
-    {
-        while ( sram_readlong( current_base + entries * 4 ) )
-        {
+  while(current_base<(endaddr)) {
+    while(sram_readlong(current_base+entries*4)) {
      entries++;
    }
-
-        printf( "sorting dir @%lx, entries: %ld\n", current_base, entries );
-        sort_dir( current_base, entries );
-        current_base += 4 * entries + 4;
+    printf("sorting dir @%lx, entries: %ld\n", current_base, entries);
+    sort_dir(current_base, entries);
+    current_base += 4*entries + 4;
    entries = 0;
  }
 }
--- a/src/filetypes.h
+++ b/src/filetypes.h
@ -37,8 +37,7 @@

 #define FS_MAX_DEPTH	(10)
 #define SYS_DIR_NAME	((const char*)"sd2snes")
-typedef enum
-{
+typedef enum {
  TYPE_UNKNOWN = 0, /* 0 */
  TYPE_SMC,         /* 1 */
  TYPE_SRM,         /* 2 */
@ -48,12 +47,12 @@ typedef enum


 char fs_path[256];
-SNES_FTYPE determine_filetype( char *filename );
+SNES_FTYPE determine_filetype(char* filename);
 //uint32_t scan_fs();
-uint16_t scan_flat( const char *path );
-uint32_t scan_dir( char *path, FILINFO *fno_param, char mkdb, uint32_t this_subdir_tgt );
-FRESULT get_db_id( uint32_t * );
-int get_num_dirent( uint32_t addr );
-void sort_all_dir( uint32_t endaddr );
+uint16_t scan_flat(const char* path);
+uint32_t scan_dir(char* path, FILINFO* fno_param, char mkdb, uint32_t this_subdir_tgt);
+FRESULT get_db_id(uint32_t*);
+int get_num_dirent(uint32_t addr);
+void sort_all_dir(uint32_t endaddr);

 #endif
--- a/src/fpga.c
+++ b/src/fpga.c
@ -52,208 +52,156 @@
 #include "rle.h"
 #include "cfgware.h"

-void fpga_set_prog_b( uint8_t val )
-{
-    if ( val )
-    {
-        BITBAND( PROGBREG->FIOSET, PROGBBIT ) = 1;
-    }
+void fpga_set_prog_b(uint8_t val) {
+  if(val)
+    BITBAND(PROGBREG->FIOSET, PROGBBIT) = 1;
  else
-    {
-        BITBAND( PROGBREG->FIOCLR, PROGBBIT ) = 1;
-    }
+    BITBAND(PROGBREG->FIOCLR, PROGBBIT) = 1;
 }

-void fpga_set_cclk( uint8_t val )
-{
-    if ( val )
-    {
-        BITBAND( CCLKREG->FIOSET, CCLKBIT ) = 1;
-    }
+void fpga_set_cclk(uint8_t val) {
+  if(val)
+    BITBAND(CCLKREG->FIOSET, CCLKBIT) = 1;
  else
-    {
-        BITBAND( CCLKREG->FIOCLR, CCLKBIT ) = 1;
-    }
+    BITBAND(CCLKREG->FIOCLR, CCLKBIT) = 1;
 }

-int fpga_get_initb()
-{
-    return BITBAND( INITBREG->FIOPIN, INITBBIT );
+int fpga_get_initb() {
+  return BITBAND(INITBREG->FIOPIN, INITBBIT);
 }

-void fpga_init()
-{
-    /* mainly GPIO directions */
-    BITBAND( CCLKREG->FIODIR, CCLKBIT ) = 1; /* CCLK */
-    BITBAND( DONEREG->FIODIR, DONEBIT ) = 0; /* DONE */
-    BITBAND( PROGBREG->FIODIR, PROGBBIT ) = 1; /* PROG_B */
-    BITBAND( DINREG->FIODIR, DINBIT ) = 1; /* DIN */
-    BITBAND( INITBREG->FIODIR, INITBBIT ) = 0; /* INIT_B */
+void fpga_init() {
+/* mainly GPIO directions */
+  BITBAND(CCLKREG->FIODIR, CCLKBIT) = 1; /* CCLK */
+  BITBAND(DONEREG->FIODIR, DONEBIT) = 0; /* DONE */
+  BITBAND(PROGBREG->FIODIR, PROGBBIT) = 1; /* PROG_B */
+  BITBAND(DINREG->FIODIR, DINBIT) = 1; /* DIN */
+  BITBAND(INITBREG->FIODIR, INITBBIT) = 0; /* INIT_B */

  LPC_GPIO2->FIOMASK1 = 0;
-    SPI_OFFLOAD = 0;

-    fpga_set_cclk( 0 );  /* initial clk=0 */
+  SPI_OFFLOAD=0;
+  fpga_set_cclk(0);    /* initial clk=0 */
 }

-int fpga_get_done( void )
-{
-    return BITBAND( DONEREG->FIOPIN, DONEBIT );
+int fpga_get_done(void) {
+  return BITBAND(DONEREG->FIOPIN, DONEBIT);
 }

-void fpga_postinit()
-{
+void fpga_postinit() {
  LPC_GPIO2->FIOMASK1 = 0;
 }

-void fpga_pgm( uint8_t *filename )
-{
+void fpga_pgm(uint8_t* filename) {
  int MAXRETRIES = 10;
  int retries = MAXRETRIES;
  uint8_t data;
  int i;
  tick_t timeout;
-
-    do
-    {
-        i = 0;
-        timeout = getticks() + 100;
-        fpga_set_prog_b( 0 );
-
-        if ( BITBAND( PROGBREG->FIOPIN, PROGBBIT ) )
-        {
-            printf( "PROGB is stuck high!\n" );
-            led_panic();
-        }
-
-        uart_putc( 'P' );
-        fpga_set_prog_b( 1 );
-
-        while ( !fpga_get_initb() )
-        {
-            if ( getticks() > timeout )
-            {
-                printf( "no response from FPGA trying to initiate configuration!\n" );
-                led_panic();
-            }
-        };
-
-        if ( fpga_get_done() )
-        {
-            printf( "DONE is stuck high!\n" );
-            led_panic();
-        }
-
-        LPC_GPIO2->FIOMASK1 = ~( BV( 0 ) );
-        uart_putc( 'p' );
-
-
  /* open configware file */
-        file_open( filename, FA_READ );
-
-        if ( file_res )
-        {
-            uart_putc( '?' );
-            uart_putc( 0x30 + file_res );
+  file_open(filename, FA_READ);
+  if(file_res) {
+    uart_putc('?');
+    uart_putc(0x30+file_res);
    return;
  }

-        uart_putc( 'C' );
+  do {
+    i=0;
+    timeout = getticks() + 1;
+    fpga_set_prog_b(0);
+    while(BITBAND(PROGBREG->FIOPIN, PROGBBIT)) {
+      if(getticks() > timeout) {
+        printf("PROGB is stuck high!\n");
+        led_panic(LED_PANIC_FPGA_PROGB_STUCK);
+      }
+    }
+    timeout = getticks() + 100;
+    uart_putc('P');
+    fpga_set_prog_b(1);
+    while(!fpga_get_initb()){
+      if(getticks() > timeout) {
+        printf("no response from FPGA trying to initiate configuration!\n");
+        led_panic(LED_PANIC_FPGA_NO_INITB);
+      }
+    };
+    timeout = getticks() + 100;
+    while(fpga_get_done()) {
+      if(getticks() > timeout) {
+        printf("DONE is stuck high!\n");
+        led_panic(LED_PANIC_FPGA_DONE_STUCK);
+      }
+    }
+    LPC_GPIO2->FIOMASK1 = ~(BV(0));
+    uart_putc('p');

-        for ( ;; )
-        {
+    uart_putc('C');
+
+    for (;;) {
      data = rle_file_getc();
      i++;
-
-            if ( file_status || file_res )
-            {
-                break;    /* error or eof */
+      if (file_status || file_res) break;   /* error or eof */
+      FPGA_SEND_BYTE_SERIAL(data);
    }
-
-            FPGA_SEND_BYTE_SERIAL( data );
-        }
-
-        uart_putc( 'c' );
+    uart_putc('c');
    file_close();
-        printf( "fpga_pgm: %d bytes programmed\n", i );
-        delay_ms( 1 );
+    printf("fpga_pgm: %d bytes programmed\n", i);
+    delay_ms(1);
+  } while (!fpga_get_done() && retries--);
+  if(!fpga_get_done()) {
+    printf("FPGA failed to configure after %d tries.\n", MAXRETRIES);
+    led_panic(LED_PANIC_FPGA_NOCONF);
  }
-    while ( !fpga_get_done() && retries-- );
-
-    if ( !fpga_get_done() )
-    {
-        printf( "FPGA failed to configure after %d tries.\n", MAXRETRIES );
-        led_panic();
-    }
-
-    printf( "FPGA configured\n" );
+  printf("FPGA configured\n");
  fpga_postinit();
 }

-void fpga_rompgm()
-{
+void fpga_rompgm() {
  int MAXRETRIES = 10;
  int retries = MAXRETRIES;
  uint8_t data;
  int i;
  tick_t timeout;
-
-    do
-    {
-        i = 0;
+  do {
+    i=0;
    timeout = getticks() + 100;
-        fpga_set_prog_b( 0 );
-        uart_putc( 'P' );
-        fpga_set_prog_b( 1 );
-
-        while ( !fpga_get_initb() )
-        {
-            if ( getticks() > timeout )
-            {
-                printf( "no response from FPGA trying to initiate configuration!\n" );
-                led_panic();
+    fpga_set_prog_b(0);
+    uart_putc('P');
+    fpga_set_prog_b(1);
+    while(!fpga_get_initb()){
+      if(getticks() > timeout) {
+        printf("no response from FPGA trying to initiate configuration!\n");
+        led_panic(LED_PANIC_FPGA_NO_INITB);
      }
    };
-
-        if ( fpga_get_done() )
-        {
-            printf( "DONE is stuck high!\n" );
-            led_panic();
+    timeout = getticks() + 100;
+    while(fpga_get_done()) {
+      if(getticks() > timeout) {
+        printf("DONE is stuck high!\n");
+        led_panic(LED_PANIC_FPGA_DONE_STUCK);
      }
-
-        LPC_GPIO2->FIOMASK1 = ~( BV( 0 ) );
-        uart_putc( 'p' );
+    }
+    LPC_GPIO2->FIOMASK1 = ~(BV(0));
+    uart_putc('p');

    /* open configware file */
-        rle_mem_init( cfgware, sizeof( cfgware ) );
-        printf( "sizeof(cfgware) = %d\n", sizeof( cfgware ) );
-
-        for ( ;; )
-        {
+    rle_mem_init(cfgware, sizeof(cfgware));
+    printf("sizeof(cfgware) = %d\n", sizeof(cfgware));
+    for (;;) {
      data = rle_mem_getc();
-
-            if ( rle_state )
-            {
-                break;
-            }
-
+      if(rle_state) break;
      i++;
-            FPGA_SEND_BYTE_SERIAL( data );
+      FPGA_SEND_BYTE_SERIAL(data);
    }
-
-        uart_putc( 'c' );
-        printf( "fpga_pgm: %d bytes programmed\n", i );
-        delay_ms( 1 );
+    uart_putc('c');
+    printf("fpga_pgm: %d bytes programmed\n", i);
+    delay_ms(1);
+  } while (!fpga_get_done() && retries--);
+  if(!fpga_get_done()) {
+    printf("FPGA failed to configure after %d tries.\n", MAXRETRIES);
+    led_panic(LED_PANIC_FPGA_NOCONF);
  }
-    while ( !fpga_get_done() && retries-- );
-
-    if ( !fpga_get_done() )
-    {
-        printf( "FPGA failed to configure after %d tries.\n", MAXRETRIES );
-        led_panic();
-    }
-
-    printf( "FPGA configured\n" );
+  printf("FPGA configured\n");
  fpga_postinit();
 }

--- a/src/fpga.h
+++ b/src/fpga.h
@ -30,14 +30,14 @@
 #include <arm/NXP/LPC17xx/LPC17xx.h>
 #include "bits.h"

-void fpga_set_prog_b( uint8_t val );
-void fpga_set_cclk( uint8_t val );
-int fpga_get_initb( void );
+void fpga_set_prog_b(uint8_t val);
+void fpga_set_cclk(uint8_t val);
+int fpga_get_initb(void);

-void fpga_init( void );
-void fpga_postinit( void );
-void fpga_pgm( uint8_t *filename );
-void fpga_rompgm( void );
+void fpga_init(void);
+void fpga_postinit(void);
+void fpga_pgm(uint8_t* filename);
+void fpga_rompgm(void);

 uint8_t SPI_OFFLOAD;

@ -58,10 +58,10 @@ uint8_t SPI_OFFLOAD;

 // some macros for bulk transfers (faster)
 #define FPGA_SEND_BYTE_SERIAL(data)	do {SET_FPGA_DIN(data>>7); CCLK();\
-        SET_FPGA_DIN(data>>6); CCLK(); SET_FPGA_DIN(data>>5); CCLK();\
-        SET_FPGA_DIN(data>>4); CCLK(); SET_FPGA_DIN(data>>3); CCLK();\
-        SET_FPGA_DIN(data>>2); CCLK(); SET_FPGA_DIN(data>>1); CCLK();\
-        SET_FPGA_DIN(data); CCLK();} while (0)
+SET_FPGA_DIN(data>>6); CCLK(); SET_FPGA_DIN(data>>5); CCLK();\
+SET_FPGA_DIN(data>>4); CCLK(); SET_FPGA_DIN(data>>3); CCLK();\
+SET_FPGA_DIN(data>>2); CCLK(); SET_FPGA_DIN(data>>1); CCLK();\
+SET_FPGA_DIN(data); CCLK();} while (0)
 #define SET_CCLK()			do {BITBAND(LPC_GPIO0->FIOSET, 11) = 1;} while (0)
 #define CLR_CCLK()			do {BITBAND(LPC_GPIO0->FIOCLR, 11) = 1;} while (0)
 #define CCLK()				do {SET_CCLK(); CLR_CCLK();} while (0)
--- a/src/fpga_spi.c
+++ b/src/fpga_spi.c
@ -142,292 +142,258 @@
 #include "timer.h"
 #include "sdnative.h"

-void fpga_spi_init( void )
-{
+void fpga_spi_init(void) {
  spi_init();
-    BITBAND( FPGA_MCU_RDY_REG->FIODIR, FPGA_MCU_RDY_BIT ) = 0;
+  BITBAND(FPGA_MCU_RDY_REG->FIODIR, FPGA_MCU_RDY_BIT) = 0;
 }

-void set_msu_addr( uint16_t address )
-{
+void set_msu_addr(uint16_t address) {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_SETADDR | FPGA_TGT_MSUBUF );
-    FPGA_TX_BYTE( ( address >> 8 ) & 0xff );
-    FPGA_TX_BYTE( ( address ) & 0xff );
+  FPGA_TX_BYTE(FPGA_CMD_SETADDR | FPGA_TGT_MSUBUF);
+  FPGA_TX_BYTE((address>>8)&0xff);
+  FPGA_TX_BYTE((address)&0xff);
  FPGA_DESELECT();
 }

-void set_dac_addr( uint16_t address )
-{
+void set_dac_addr(uint16_t address) {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_SETADDR | FPGA_TGT_DACBUF );
-    FPGA_TX_BYTE( ( address >> 8 ) & 0xff );
-    FPGA_TX_BYTE( ( address ) & 0xff );
+  FPGA_TX_BYTE(FPGA_CMD_SETADDR | FPGA_TGT_DACBUF);
+  FPGA_TX_BYTE((address>>8)&0xff);
+  FPGA_TX_BYTE((address)&0xff);
  FPGA_DESELECT();
 }

-void set_mcu_addr( uint32_t address )
-{
+void set_mcu_addr(uint32_t address) {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_SETADDR | FPGA_TGT_MEM );
-    FPGA_TX_BYTE( ( address >> 16 ) & 0xff );
-    FPGA_TX_BYTE( ( address >> 8 ) & 0xff );
-    FPGA_TX_BYTE( ( address ) & 0xff );
+  FPGA_TX_BYTE(FPGA_CMD_SETADDR | FPGA_TGT_MEM);
+  FPGA_TX_BYTE((address>>16)&0xff);
+  FPGA_TX_BYTE((address>>8)&0xff);
+  FPGA_TX_BYTE((address)&0xff);
  FPGA_DESELECT();
 }

-void set_saveram_mask( uint32_t mask )
-{
+void set_saveram_mask(uint32_t mask) {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_SETRAMMASK );
-    FPGA_TX_BYTE( ( mask >> 16 ) & 0xff );
-    FPGA_TX_BYTE( ( mask >> 8 ) & 0xff );
-    FPGA_TX_BYTE( ( mask ) & 0xff );
+  FPGA_TX_BYTE(FPGA_CMD_SETRAMMASK);
+  FPGA_TX_BYTE((mask>>16)&0xff);
+  FPGA_TX_BYTE((mask>>8)&0xff);
+  FPGA_TX_BYTE((mask)&0xff);
  FPGA_DESELECT();
 }

-void set_rom_mask( uint32_t mask )
-{
+void set_rom_mask(uint32_t mask) {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_SETROMMASK );
-    FPGA_TX_BYTE( ( mask >> 16 ) & 0xff );
-    FPGA_TX_BYTE( ( mask >> 8 ) & 0xff );
-    FPGA_TX_BYTE( ( mask ) & 0xff );
+  FPGA_TX_BYTE(FPGA_CMD_SETROMMASK);
+  FPGA_TX_BYTE((mask>>16)&0xff);
+  FPGA_TX_BYTE((mask>>8)&0xff);
+  FPGA_TX_BYTE((mask)&0xff);
  FPGA_DESELECT();
 }

-void set_mapper( uint8_t val )
-{
+void set_mapper(uint8_t val) {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_SETMAPPER( val ) );
+  FPGA_TX_BYTE(FPGA_CMD_SETMAPPER(val));
  FPGA_DESELECT();
 }

-uint8_t fpga_test()
-{
+uint8_t fpga_test() {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_TEST );
+  FPGA_TX_BYTE(FPGA_CMD_TEST);
  uint8_t result = FPGA_RX_BYTE();
  FPGA_DESELECT();
  return result;
 }

-uint16_t fpga_status()
-{
+uint16_t fpga_status() {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_GETSTATUS );
-    uint16_t result = ( FPGA_RX_BYTE() ) << 8;
+  FPGA_TX_BYTE(FPGA_CMD_GETSTATUS);
+  uint16_t result = (FPGA_RX_BYTE()) << 8;
  result |= FPGA_RX_BYTE();
  FPGA_DESELECT();
  return result;
 }

-void fpga_set_sddma_range( uint16_t start, uint16_t end )
-{
-    printf( "%s %08X -> %08X\n", __func__, start, end );
+void fpga_set_sddma_range(uint16_t start, uint16_t end) {
+  printf("%s %08X -> %08X\n", __func__, start, end);
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_SDDMA_RANGE );
-    FPGA_TX_BYTE( start >> 8 );
-    FPGA_TX_BYTE( start & 0xff );
-    FPGA_TX_BYTE( end >> 8 );
-    FPGA_TX_BYTE( end & 0xff );
+  FPGA_TX_BYTE(FPGA_CMD_SDDMA_RANGE);
+  FPGA_TX_BYTE(start>>8);
+  FPGA_TX_BYTE(start&0xff);
+  FPGA_TX_BYTE(end>>8);
+  FPGA_TX_BYTE(end&0xff);
  FPGA_DESELECT();
 }

-void fpga_sddma( uint8_t tgt, uint8_t partial )
-{
-    //printf("%s %02X -> %02X\n", __func__, tgt, partial);
-    //uint32_t test = 0;
-    //uint8_t status = 0;
-    BITBAND( SD_CLKREG->FIODIR, SD_CLKPIN ) = 0;
+void fpga_sddma(uint8_t tgt, uint8_t partial) {
+  BITBAND(SD_CLKREG->FIODIR, SD_CLKPIN) = 0;
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_SDDMA | ( tgt & 3 ) | ( partial ? FPGA_SDDMA_PARTIAL : 0 ) );
-    FPGA_TX_BYTE( 0x00 ); /* dummy for falling DMA_EN edge */
+  FPGA_TX_BYTE(FPGA_CMD_SDDMA | (tgt & 3) | (partial ? FPGA_SDDMA_PARTIAL : 0));
+  FPGA_TX_BYTE(0x00); /* dummy for falling DMA_EN edge */
  FPGA_DESELECT();
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_GETSTATUS );
-    DBG_SD printf( "FPGA DMA request sent, wait for completion..." );
-
-    while ( FPGA_RX_BYTE() & 0x80 )
-    {
+  FPGA_TX_BYTE(FPGA_CMD_GETSTATUS);
+  DBG_SD printf("FPGA DMA request sent, wait for completion...");
+  while(FPGA_RX_BYTE() & 0x80) {
    FPGA_RX_BYTE(); /* eat the 2nd status byte */
  }
-
-    DBG_SD printf( "...complete\n" );
+  DBG_SD printf("...complete\n");
  FPGA_DESELECT();
-    BITBAND( SD_CLKREG->FIODIR, SD_CLKPIN ) = 1;
+  BITBAND(SD_CLKREG->FIODIR, SD_CLKPIN) = 1;
 }

-void dac_play()
-{
+void dac_play() {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_DACPLAY );
-    FPGA_TX_BYTE( 0x00 ); /* latch reset */
+  FPGA_TX_BYTE(FPGA_CMD_DACPLAY);
+  FPGA_TX_BYTE(0x00); /* latch reset */
  FPGA_DESELECT();
 }

-void dac_pause()
-{
+void dac_pause() {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_DACPAUSE );
-    FPGA_TX_BYTE( 0x00 ); /* latch reset */
+  FPGA_TX_BYTE(FPGA_CMD_DACPAUSE);
+  FPGA_TX_BYTE(0x00); /* latch reset */
  FPGA_DESELECT();
 }

-void dac_reset()
-{
+void dac_reset() {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_DACRESETPTR );
-    FPGA_TX_BYTE( 0x00 ); /* latch reset */
-    FPGA_TX_BYTE( 0x00 ); /* latch reset */
+  FPGA_TX_BYTE(FPGA_CMD_DACRESETPTR);
+  FPGA_TX_BYTE(0x00); /* latch reset */
+  FPGA_TX_BYTE(0x00); /* latch reset */
  FPGA_DESELECT();
 }

-void msu_reset( uint16_t address )
-{
+void msu_reset(uint16_t address) {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_MSUSETPTR );
-    FPGA_TX_BYTE( ( address >> 8 ) & 0xff ); /* address hi */
-    FPGA_TX_BYTE( address & 0xff );    /* address lo */
-    FPGA_TX_BYTE( 0x00 );              /* latch reset */
-    FPGA_TX_BYTE( 0x00 );              /* latch reset */
+  FPGA_TX_BYTE(FPGA_CMD_MSUSETPTR);
+  FPGA_TX_BYTE((address>>8) & 0xff); /* address hi */
+  FPGA_TX_BYTE(address & 0xff);      /* address lo */
+  FPGA_TX_BYTE(0x00);                /* latch reset */
+  FPGA_TX_BYTE(0x00);                /* latch reset */
  FPGA_DESELECT();
 }

-void set_msu_status( uint8_t set, uint8_t reset )
-{
+void set_msu_status(uint8_t set, uint8_t reset) {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_MSUSETBITS );
-    FPGA_TX_BYTE( set );
-    FPGA_TX_BYTE( reset );
-    FPGA_TX_BYTE( 0x00 ); /* latch reset */
+  FPGA_TX_BYTE(FPGA_CMD_MSUSETBITS);
+  FPGA_TX_BYTE(set);
+  FPGA_TX_BYTE(reset);
+  FPGA_TX_BYTE(0x00); /* latch reset */
  FPGA_DESELECT();
 }

-uint16_t get_msu_track()
-{
+uint16_t get_msu_track() {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_MSUGETTRACK );
-    uint16_t result = ( FPGA_RX_BYTE() ) << 8;
+  FPGA_TX_BYTE(FPGA_CMD_MSUGETTRACK);
+  uint16_t result = (FPGA_RX_BYTE()) << 8;
  result |= FPGA_RX_BYTE();
  FPGA_DESELECT();
  return result;
 }

-uint32_t get_msu_offset()
-{
+uint32_t get_msu_offset() {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_MSUGETADDR );
-    uint32_t result = ( FPGA_RX_BYTE() ) << 24;
-    result |= ( FPGA_RX_BYTE() ) << 16;
-    result |= ( FPGA_RX_BYTE() ) << 8;
-    result |= ( FPGA_RX_BYTE() );
+  FPGA_TX_BYTE(FPGA_CMD_MSUGETADDR);
+  uint32_t result = (FPGA_RX_BYTE()) << 24;
+  result |= (FPGA_RX_BYTE()) << 16;
+  result |= (FPGA_RX_BYTE()) << 8;
+  result |= (FPGA_RX_BYTE());
  FPGA_DESELECT();
  return result;
 }

-uint32_t get_snes_sysclk()
-{
+uint32_t get_snes_sysclk() {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_GETSYSCLK );
-    FPGA_TX_BYTE( 0x00 ); /* dummy (copy current sysclk count to register) */
-    uint32_t result = ( FPGA_RX_BYTE() ) << 24;
-    result |= ( FPGA_RX_BYTE() ) << 16;
-    result |= ( FPGA_RX_BYTE() ) << 8;
-    result |= ( FPGA_RX_BYTE() );
+  FPGA_TX_BYTE(FPGA_CMD_GETSYSCLK);
+  FPGA_TX_BYTE(0x00); /* dummy (copy current sysclk count to register) */
+  uint32_t result = (FPGA_RX_BYTE()) << 24;
+  result |= (FPGA_RX_BYTE()) << 16;
+  result |= (FPGA_RX_BYTE()) << 8;
+  result |= (FPGA_RX_BYTE());
  FPGA_DESELECT();
  return result;
 }

-void set_bsx_regs( uint8_t set, uint8_t reset )
-{
+void set_bsx_regs(uint8_t set, uint8_t reset) {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_BSXSETBITS );
-    FPGA_TX_BYTE( set );
-    FPGA_TX_BYTE( reset );
-    FPGA_TX_BYTE( 0x00 ); /* latch reset */
+  FPGA_TX_BYTE(FPGA_CMD_BSXSETBITS);
+  FPGA_TX_BYTE(set);
+  FPGA_TX_BYTE(reset);
+  FPGA_TX_BYTE(0x00); /* latch reset */
  FPGA_DESELECT();
 }

-void set_fpga_time( uint64_t time )
-{
+void set_fpga_time(uint64_t time) {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_RTCSET );
-    FPGA_TX_BYTE( ( time >> 48 ) & 0xff );
-    FPGA_TX_BYTE( ( time >> 40 ) & 0xff );
-    FPGA_TX_BYTE( ( time >> 32 ) & 0xff );
-    FPGA_TX_BYTE( ( time >> 24 ) & 0xff );
-    FPGA_TX_BYTE( ( time >> 16 ) & 0xff );
-    FPGA_TX_BYTE( ( time >> 8 ) & 0xff );
-    FPGA_TX_BYTE( time & 0xff );
-    FPGA_TX_BYTE( 0x00 );
+  FPGA_TX_BYTE(FPGA_CMD_RTCSET);
+  FPGA_TX_BYTE((time >> 48) & 0xff);
+  FPGA_TX_BYTE((time >> 40) & 0xff);
+  FPGA_TX_BYTE((time >> 32) & 0xff);
+  FPGA_TX_BYTE((time >> 24) & 0xff);
+  FPGA_TX_BYTE((time >> 16) & 0xff);
+  FPGA_TX_BYTE((time >> 8) & 0xff);
+  FPGA_TX_BYTE(time & 0xff);
+  FPGA_TX_BYTE(0x00);
  FPGA_DESELECT();
 }

-void fpga_reset_srtc_state()
-{
+void fpga_reset_srtc_state() {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_SRTCRESET );
-    FPGA_TX_BYTE( 0x00 );
-    FPGA_TX_BYTE( 0x00 );
+  FPGA_TX_BYTE(FPGA_CMD_SRTCRESET);
+  FPGA_TX_BYTE(0x00);
+  FPGA_TX_BYTE(0x00);
  FPGA_DESELECT();
 }

-void fpga_reset_dspx_addr()
-{
+void fpga_reset_dspx_addr() {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_DSPRESETPTR );
-    FPGA_TX_BYTE( 0x00 );
-    FPGA_TX_BYTE( 0x00 );
+  FPGA_TX_BYTE(FPGA_CMD_DSPRESETPTR);
+  FPGA_TX_BYTE(0x00);
+  FPGA_TX_BYTE(0x00);
  FPGA_DESELECT();
 }

-void fpga_write_dspx_pgm( uint32_t data )
-{
+void fpga_write_dspx_pgm(uint32_t data) {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_DSPWRITEPGM );
-    FPGA_TX_BYTE( ( data >> 16 ) & 0xff );
-    FPGA_TX_BYTE( ( data >> 8 ) & 0xff );
-    FPGA_TX_BYTE( ( data ) & 0xff );
-    FPGA_TX_BYTE( 0x00 );
-    FPGA_TX_BYTE( 0x00 );
+  FPGA_TX_BYTE(FPGA_CMD_DSPWRITEPGM);
+  FPGA_TX_BYTE((data>>16)&0xff);
+  FPGA_TX_BYTE((data>>8)&0xff);
+  FPGA_TX_BYTE((data)&0xff);
+  FPGA_TX_BYTE(0x00);
+  FPGA_TX_BYTE(0x00);
  FPGA_DESELECT();
 }

-void fpga_write_dspx_dat( uint16_t data )
-{
+void fpga_write_dspx_dat(uint16_t data) {
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_DSPWRITEDAT );
-    FPGA_TX_BYTE( ( data >> 8 ) & 0xff );
-    FPGA_TX_BYTE( ( data ) & 0xff );
-    FPGA_TX_BYTE( 0x00 );
-    FPGA_TX_BYTE( 0x00 );
+  FPGA_TX_BYTE(FPGA_CMD_DSPWRITEDAT);
+  FPGA_TX_BYTE((data>>8)&0xff);
+  FPGA_TX_BYTE((data)&0xff);
+  FPGA_TX_BYTE(0x00);
+  FPGA_TX_BYTE(0x00);
  FPGA_DESELECT();
 }

-void fpga_dspx_reset( uint8_t reset )
-{
+void fpga_dspx_reset(uint8_t reset) {
  FPGA_SELECT();
-    FPGA_TX_BYTE( reset ? FPGA_CMD_DSPRESET : FPGA_CMD_DSPUNRESET );
-    FPGA_TX_BYTE( 0x00 );
+  FPGA_TX_BYTE(reset ? FPGA_CMD_DSPRESET : FPGA_CMD_DSPUNRESET);
+  FPGA_TX_BYTE(0x00);
  FPGA_DESELECT();
 }

-void fpga_set_features( uint8_t feat )
-{
-    printf( "set features: %02x\n", feat );
+void fpga_set_features(uint8_t feat) {
+  printf("set features: %02x\n", feat);
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_SETFEATURE );
-    FPGA_TX_BYTE( feat );
+  FPGA_TX_BYTE(FPGA_CMD_SETFEATURE);
+  FPGA_TX_BYTE(feat);
  FPGA_DESELECT();
 }

-void fpga_set_213f( uint8_t data )
-{
-    printf( "set 213f: %d\n", data );
+void fpga_set_213f(uint8_t data) {
+  printf("set 213f: %d\n", data);
  FPGA_SELECT();
-    FPGA_TX_BYTE( FPGA_CMD_SET213F );
-    FPGA_TX_BYTE( data );
+  FPGA_TX_BYTE(FPGA_CMD_SET213F);
+  FPGA_TX_BYTE(data);
  FPGA_DESELECT();
 }

--- a/src/fpga_spi.h
+++ b/src/fpga_spi.h
@ -95,35 +95,35 @@
 #define FPGA_CMD_GETSYSCLK      (0xfe)
 #define FPGA_CMD_ECHO           (0xff)

-void fpga_spi_init( void );
-uint8_t fpga_test( void );
-uint16_t fpga_status( void );
-void spi_fpga( void );
-void spi_sd( void );
-void spi_none( void );
-void set_mcu_addr( uint32_t );
-void set_dac_addr( uint16_t );
-void dac_play( void );
-void dac_pause( void );
-void dac_reset( void );
-void msu_reset( uint16_t );
-void set_msu_addr( uint16_t );
-void set_msu_status( uint8_t set, uint8_t reset );
-void set_saveram_mask( uint32_t );
-void set_rom_mask( uint32_t );
-void set_mapper( uint8_t val );
-void fpga_sddma( uint8_t tgt, uint8_t partial );
-void fpga_set_sddma_range( uint16_t start, uint16_t end );
-uint16_t get_msu_track( void );
-uint32_t get_msu_offset( void );
-uint32_t get_snes_sysclk( void );
-void set_bsx_regs( uint8_t set, uint8_t reset );
-void set_fpga_time( uint64_t time );
-void fpga_reset_srtc_state( void );
-void fpga_reset_dspx_addr( void );
-void fpga_write_dspx_pgm( uint32_t data );
-void fpga_write_dspx_dat( uint16_t data );
-void fpga_dspx_reset( uint8_t reset );
-void fpga_set_features( uint8_t feat );
-void fpga_set_213f( uint8_t data );
+void fpga_spi_init(void);
+uint8_t fpga_test(void);
+uint16_t fpga_status(void);
+void spi_fpga(void);
+void spi_sd(void);
+void spi_none(void);
+void set_mcu_addr(uint32_t);
+void set_dac_addr(uint16_t);
+void dac_play(void);
+void dac_pause(void);
+void dac_reset(void);
+void msu_reset(uint16_t);
+void set_msu_addr(uint16_t);
+void set_msu_status(uint8_t set, uint8_t reset);
+void set_saveram_mask(uint32_t);
+void set_rom_mask(uint32_t);
+void set_mapper(uint8_t val);
+void fpga_sddma(uint8_t tgt, uint8_t partial);
+void fpga_set_sddma_range(uint16_t start, uint16_t end);
+uint16_t get_msu_track(void);
+uint32_t get_msu_offset(void);
+uint32_t get_snes_sysclk(void);
+void set_bsx_regs(uint8_t set, uint8_t reset);
+void set_fpga_time(uint64_t time);
+void fpga_reset_srtc_state(void);
+void fpga_reset_dspx_addr(void);
+void fpga_write_dspx_pgm(uint32_t data);
+void fpga_write_dspx_dat(uint16_t data);
+void fpga_dspx_reset(uint8_t reset);
+void fpga_set_features(uint8_t feat);
+void fpga_set_213f(uint8_t data);
 #endif
--- a/src/irq.c
+++ b/src/irq.c
@ -4,12 +4,9 @@
 #include "sdnative.h"
 #include "uart.h"

-void EINT3_IRQHandler( void )
-{
-    NVIC_ClearPendingIRQ( EINT3_IRQn );
-
-    if ( SD_CHANGE_DETECT )
-    {
+void EINT3_IRQHandler(void) {
+  NVIC_ClearPendingIRQ(EINT3_IRQn);
+  if(SD_CHANGE_DETECT) {
    SD_CHANGE_CLR();
    sdn_changed();
  }
--- a/src/led.c
+++ b/src/led.c
@ -6,7 +6,7 @@
 #include "led.h"
 #include "cli.h"

-static uint8_t led_bright[16] = {255, 253, 252, 251, 249, 247, 244, 239, 232, 223, 210, 191, 165, 127, 74, 0};
+static uint8_t led_bright[16]={255,253,252,251,249,247,244,239,232,223,210,191,165,127,74,0};

 int led_rdyledstate = 0;
 int led_readledstate = 0;
@ -22,156 +22,127 @@ int led_pwmstate = 0;
   write  red    P1.23 PWM1[4]
 */

-void rdyled( unsigned int state )
-{
-    if ( led_pwmstate )
-    {
-        rdybright( state ? 15 : 0 );
+void rdyled(unsigned int state) {
+  if(led_pwmstate) {
+    rdybright(state?15:0);
+  } else {
+    BITBAND(LPC_GPIO2->FIODIR, 4) = state;
  }
-    else
-    {
-        BITBAND( LPC_GPIO2->FIODIR, 4 ) = state;
-    }
-
  led_rdyledstate = state;
 }

-void readled( unsigned int state )
-{
-    if ( led_pwmstate )
-    {
-        readbright( state ? 15 : 0 );
+void readled(unsigned int state) {
+  if(led_pwmstate) {
+    readbright(state?15:0);
+  } else {
+    BITBAND(LPC_GPIO2->FIODIR, 5) = state;
  }
-    else
-    {
-        BITBAND( LPC_GPIO2->FIODIR, 5 ) = state;
-    }
-
  led_readledstate = state;
 }

-void writeled( unsigned int state )
-{
-    if ( led_pwmstate )
-    {
-        writebright( state ? 15 : 0 );
+void writeled(unsigned int state) {
+  if(led_pwmstate) {
+    writebright(state?15:0);
+  } else {
+    BITBAND(LPC_GPIO1->FIODIR, 23) = state;
  }
-    else
-    {
-        BITBAND( LPC_GPIO1->FIODIR, 23 ) = state;
-    }
-
  led_writeledstate = state;
 }

-void rdybright( uint8_t bright )
-{
-    LPC_PWM1->MR5 = led_bright[( bright & 15 )];
-    BITBAND( LPC_PWM1->LER, 5 ) = 1;
+void rdybright(uint8_t bright) {
+  LPC_PWM1->MR5 = led_bright[(bright & 15)];
+  BITBAND(LPC_PWM1->LER, 5) = 1;
 }
-void readbright( uint8_t bright )
-{
-    LPC_PWM1->MR6 = led_bright[( bright & 15 )];
-    BITBAND( LPC_PWM1->LER, 6 ) = 1;
+void readbright(uint8_t bright) {
+  LPC_PWM1->MR6 = led_bright[(bright & 15)];
+  BITBAND(LPC_PWM1->LER, 6) = 1;
 }
-void writebright( uint8_t bright )
-{
-    LPC_PWM1->MR4 = led_bright[( bright & 15 )];
-    BITBAND( LPC_PWM1->LER, 4 ) = 1;
+void writebright(uint8_t bright) {
+  LPC_PWM1->MR4 = led_bright[(bright & 15)];
+  BITBAND(LPC_PWM1->LER, 4) = 1;
 }

-void led_clkout32( uint32_t val )
-{
-    while ( 1 )
-    {
-        rdyled( 1 );
-        delay_ms( 400 );
-        readled( ( val & BV( 31 ) ) >> 31 );
-        rdyled( 0 );
-        val <<= 1;
-        delay_ms( 400 );
+void led_clkout32(uint32_t val) {
+  while(1) {
+    rdyled(1);
+    delay_ms(400);
+    readled((val & BV(31))>>31);
+    rdyled(0);
+    val<<=1;
+    delay_ms(400);
  }
 }

-void toggle_rdy_led()
-{
-    rdyled( ~led_rdyledstate );
+void toggle_rdy_led() {
+  rdyled(~led_rdyledstate);
 }

-void toggle_read_led()
-{
-    readled( ~led_readledstate );
+void toggle_read_led() {
+  readled(~led_readledstate);
 }

-void toggle_write_led()
-{
-    writeled( ~led_writeledstate );
+void toggle_write_led() {
+  writeled(~led_writeledstate);
 }

-void led_panic()
-{
+void led_panic(uint8_t led_states) {
  led_std();
-
-    while ( 1 )
-    {
-        rdyled( 1 );
-        readled( 1 );
-        writeled( 1 );
-        delay_ms( 100 );
-        rdyled( 0 );
-        readled( 0 );
-        writeled( 0 );
-        delay_ms( 100 );
+  while(1) {
+    rdyled((led_states >> 2) & 1);
+    readled((led_states >> 1) & 1);
+    writeled(led_states & 1);
+    delay_ms(100);
+    rdyled(0);
+    readled(0);
+    writeled(0);
+    delay_ms(100);
    cli_entrycheck();
  }
 }

-void led_pwm()
-{
-    /* Rev.C P2.4, P2.5, P1.23 */
-    BITBAND( LPC_PINCON->PINSEL4, 9 ) = 0;
-    BITBAND( LPC_PINCON->PINSEL4, 8 ) = 1;
+void led_pwm() {
+/* Rev.C P2.4, P2.5, P1.23 */
+  BITBAND(LPC_PINCON->PINSEL4, 9) = 0;
+  BITBAND(LPC_PINCON->PINSEL4, 8) = 1;

-    BITBAND( LPC_PINCON->PINSEL4, 11 ) = 0;
-    BITBAND( LPC_PINCON->PINSEL4, 10 ) = 1;
+  BITBAND(LPC_PINCON->PINSEL4, 11) = 0;
+  BITBAND(LPC_PINCON->PINSEL4, 10) = 1;

-    BITBAND( LPC_PINCON->PINSEL3, 15 ) = 1;
-    BITBAND( LPC_PINCON->PINSEL3, 14 ) = 0;
+  BITBAND(LPC_PINCON->PINSEL3, 15) = 1;
+  BITBAND(LPC_PINCON->PINSEL3, 14) = 0;

-    BITBAND( LPC_PWM1->PCR, 12 ) = 1;
-    BITBAND( LPC_PWM1->PCR, 13 ) = 1;
-    BITBAND( LPC_PWM1->PCR, 14 ) = 1;
+  BITBAND(LPC_PWM1->PCR, 12) = 1;
+  BITBAND(LPC_PWM1->PCR, 13) = 1;
+  BITBAND(LPC_PWM1->PCR, 14) = 1;

  led_pwmstate = 1;
 }

-void led_std()
-{
-    BITBAND( LPC_PINCON->PINSEL4, 9 ) = 0;
-    BITBAND( LPC_PINCON->PINSEL4, 8 ) = 0;
+void led_std() {
+  BITBAND(LPC_PINCON->PINSEL4, 9) = 0;
+  BITBAND(LPC_PINCON->PINSEL4, 8) = 0;

-    BITBAND( LPC_PINCON->PINSEL4, 11 ) = 0;
-    BITBAND( LPC_PINCON->PINSEL4, 10 ) = 0;
+  BITBAND(LPC_PINCON->PINSEL4, 11) = 0;
+  BITBAND(LPC_PINCON->PINSEL4, 10) = 0;

-    BITBAND( LPC_PINCON->PINSEL3, 15 ) = 0;
-    BITBAND( LPC_PINCON->PINSEL3, 14 ) = 0;
+  BITBAND(LPC_PINCON->PINSEL3, 15) = 0;
+  BITBAND(LPC_PINCON->PINSEL3, 14) = 0;

-    BITBAND( LPC_PWM1->PCR, 12 ) = 0;
-    BITBAND( LPC_PWM1->PCR, 13 ) = 0;
-    BITBAND( LPC_PWM1->PCR, 14 ) = 0;
+  BITBAND(LPC_PWM1->PCR, 12) = 0;
+  BITBAND(LPC_PWM1->PCR, 13) = 0;
+  BITBAND(LPC_PWM1->PCR, 14) = 0;

  led_pwmstate = 0;
 }

-void led_init()
-{
-    /* power is already connected by default */
-    /* set PCLK divider to 8 */
-    BITBAND( LPC_SC->PCLKSEL0, 13 ) = 1;
-    BITBAND( LPC_SC->PCLKSEL0, 12 ) = 1;
+void led_init() {
+/* power is already connected by default */
+/* set PCLK divider to 8 */
+  BITBAND(LPC_SC->PCLKSEL0, 13) = 1;
+  BITBAND(LPC_SC->PCLKSEL0, 12) = 1;
  LPC_PWM1->MR0 = 255;
-    BITBAND( LPC_PWM1->LER, 0 ) = 1;
-    BITBAND( LPC_PWM1->TCR, 0 ) = 1;
-    BITBAND( LPC_PWM1->TCR, 3 ) = 1;
-    BITBAND( LPC_PWM1->MCR, 1 ) = 1;
+  BITBAND(LPC_PWM1->LER, 0) = 1;
+  BITBAND(LPC_PWM1->TCR, 0) = 1;
+  BITBAND(LPC_PWM1->TCR, 3) = 1;
+  BITBAND(LPC_PWM1->MCR, 1) = 1;
 }
--- a/src/led.h
+++ b/src/led.h
@ -3,6 +3,12 @@
 #ifndef _LED_H
 #define _LED_H

+#define LED_PANIC_FPGA_PROGB_STUCK (1)
+#define LED_PANIC_FPGA_NO_INITB    (2)
+#define LED_PANIC_FPGA_DONE_STUCK  (3)
+#define LED_PANIC_FPGA_NOCONF      (4)
+#define LED_PANIC_FPGA_DEAD        (5)
+
 void readbright(uint8_t bright);
 void writebright(uint8_t bright);
 void rdybright(uint8_t bright);
@ -13,7 +19,7 @@ void led_clkout32(uint32_t val);
 void toggle_rdy_led(void);
 void toggle_read_led(void);
 void toggle_write_led(void);
-void led_panic(void);
+void led_panic(uint8_t led_states);
 void led_pwm(void);
 void led_std(void);
 void led_init(void);
--- a/src/lpc1754.cfg
+++ b/src/lpc1754.cfg
@ -26,9 +26,9 @@ if { [info exists CPUTAPID ] } {
 }

 #delays on reset lines
-#if your OpenOCD version rejects "jtag_nsrst_delay" replace it with:
-adapter_nsrst_delay 200
+#if your OpenOCD version rejects "adapter_nsrst_delay" replace it with:
 #jtag_nsrst_delay 200
+adapter_nsrst_delay 200
 jtag_ntrst_delay 200

 # LPC2000 & LPC1700 -> SRST causes TRST
@ -39,7 +39,6 @@ jtag newtap $_CHIPNAME cpu -irlen 4 -expected-id $_CPUTAPID
 #jtag newtap x3s tap -irlen 6 -ircapture 0x11 -irmask 0x11 -expected-id 0x0141c093

 set _TARGETNAME $_CHIPNAME.cpu
-#target create $_TARGETNAME cortex_m3 -chain-position $_TARGETNAME -event reset-init 0
 target create $_TARGETNAME cortex_m -chain-position $_TARGETNAME -event reset-init 0

 # LPC1754 has 16kB of SRAM In the ARMv7-M "Code" area (at 0x10000000)
--- a/src/main.c
+++ b/src/main.c
@ -54,408 +54,313 @@ enum system_states
  SYS_LAST_STATUS = 1
 };

-int main( void )
+int main(void)
 {
-    uint8_t card_go = 0;
-    uint32_t saved_dir_id;
-    uint32_t mem_dir_id;
-    uint32_t mem_magic;
-    uint8_t cmd = 0;
-    uint64_t btime = 0;
-    uint32_t filesize = 0;
-    uint8_t snes_reset_prev = 0, snes_reset_now = 0, snes_reset_state = 0;
-    uint16_t reset_count = 0;
-
-    LPC_GPIO2->FIODIR = BV( 4 ) | BV( 5 );
-    LPC_GPIO1->FIODIR = BV( 23 ) | BV( SNES_CIC_PAIR_BIT );
-    BITBAND( SNES_CIC_PAIR_REG->FIOSET, SNES_CIC_PAIR_BIT ) = 1;
-    LPC_GPIO0->FIODIR = BV( 16 );
+  LPC_GPIO2->FIODIR = BV(4) | BV(5);
+  LPC_GPIO1->FIODIR = BV(23) | BV(SNES_CIC_PAIR_BIT);
+  BITBAND(SNES_CIC_PAIR_REG->FIOSET, SNES_CIC_PAIR_BIT) = 1;
+  LPC_GPIO0->FIODIR = BV(16);

 /* connect UART3 on P0[25:26] + SSP0 on P0[15:18] + MAT3.0 on P0[10] */
-    LPC_PINCON->PINSEL1 = BV( 18 ) | BV( 19 ) | BV( 20 ) | BV( 21 ) /* UART3 */
-                          | BV( 3 ) | BV( 5 );                /* SSP0 (FPGA) except SS */
-    LPC_PINCON->PINSEL0 = BV( 31 );                          /* SSP0 */
-    /*                      | BV(13) | BV(15) | BV(17) | BV(19)  SSP1 (SD) */
+  LPC_PINCON->PINSEL1 = BV(18) | BV(19) | BV(20) | BV(21) /* UART3 */
+                      | BV(3) | BV(5);                    /* SSP0 (FPGA) except SS */
+  LPC_PINCON->PINSEL0 = BV(31);                            /* SSP0 */
+/*                      | BV(13) | BV(15) | BV(17) | BV(19)  SSP1 (SD) */

 /* pull-down CIC data lines */
-    LPC_PINCON->PINMODE0 = BV( 0 ) | BV( 1 ) | BV( 2 ) | BV( 3 );
-
-    clock_disconnect(); /* Disable clock                */
-    snes_init();        /* Set SNES Reset               */
-    power_init();       /* Enable power block of LPC    */
-    timer_init();       /* Enable internal timer        */
-    uart_init();        /* Configure UART               */
-    fpga_spi_init();    /* Configure FPGA_SPI IOs       */
-    spi_preinit();      /* Initialise SPI IO            */
-    led_init();         /* Initialise LEDs IO           */
-
+  LPC_PINCON->PINMODE0 = BV(0) | BV(1) | BV(2) | BV(3);

+  clock_disconnect();
+  snes_init();
+  snes_reset(1);
+  power_init();
+  timer_init();
+  uart_init();
+  fpga_spi_init();
+  spi_preinit();
+  led_init();
 /* do this last because the peripheral init()s change PCLK dividers */
  clock_init();
-    /* Output FPGA clock */
-    LPC_PINCON->PINSEL0 |= BV( 20 ) | BV( 21 );              /* MAT3.0 (FPGA clock) */
+  LPC_PINCON->PINSEL0 |= BV(20) | BV(21);                  /* MAT3.0 (FPGA clock) */
+led_pwm();
+  sdn_init();
+  printf("\n\nsd2snes mk.2\n============\nfw ver.: " CONFIG_VERSION "\ncpu clock: %d Hz\n", CONFIG_CPU_FREQUENCY);
+printf("PCONP=%lx\n", LPC_SC->PCONP);

-    led_pwm();      /* Enabke PWM on LED (even if not used...) */
-    sdn_init();     /* SD init */
-
-    /* Print banner */
-    printf( "\n\nsd2snes mk.2\n============\nfw ver.: " CONFIG_VERSION "\ncpu clock: %d Hz\n", CONFIG_CPU_FREQUENCY );
-
-    /* Init file manager */
  file_init();
-
-    /* */
-    cic_init( 0 );
-
-    /* setup timer (fpga clk) */
-    LPC_TIM3->TCR = 2;
-    LPC_TIM3->CTCR = 0;
-    LPC_TIM3->PR = 0;
-    LPC_TIM3->EMR = EMC0TOGGLE;
-    LPC_TIM3->MCR = MR0R;
-    LPC_TIM3->MR0 = 1;
-    LPC_TIM3->TCR = 1;
-
+  cic_init(0);
+/* setup timer (fpga clk) */
+  LPC_TIM3->TCR=2;
+  LPC_TIM3->CTCR=0;
+  LPC_TIM3->PR=0;
+  LPC_TIM3->EMR=EMC0TOGGLE;
+  LPC_TIM3->MCR=MR0R;
+  LPC_TIM3->MR0=1;
+  LPC_TIM3->TCR=1;
  fpga_init();
  fpga_rompgm();
-    sram_writebyte( 0, SRAM_CMD_ADDR );
-
-    while ( 1 ) /* Main loop */
-    {
-        if ( disk_state == DISK_CHANGED )
-        {
-            sdn_init(); /* Reinit SD card */
+  sram_writebyte(0, SRAM_CMD_ADDR);
+  while(1) {
+    if(disk_state == DISK_CHANGED) {
+      sdn_init();
      newcard = 1;
    }
-
-        load_bootrle( SRAM_MENU_ADDR );
-        set_saveram_mask( 0xffff );
-        set_rom_mask( 0x3fffff );
-        set_mapper( 0x7 );
-        snes_reset( 0 );
-
-        while ( get_cic_state() == CIC_FAIL )
-        {
-            rdyled( 0 );
-            readled( 0 );
-            writeled( 0 );
-            delay_ms( 500 );
-            rdyled( 1 );
-            readled( 1 );
-            writeled( 1 );
-            delay_ms( 500 );
+    load_bootrle(SRAM_MENU_ADDR);
+    set_saveram_mask(0x1fff);
+    set_rom_mask(0x3fffff);
+    set_mapper(0x7);
+    snes_reset(0);
+    while(get_cic_state() == CIC_FAIL) {
+      rdyled(0);
+      readled(0);
+      writeled(0);
+      delay_ms(500);
+      rdyled(1);
+      readled(1);
+      writeled(1);
+      delay_ms(500);
    }
-
-        /* Wait for valid card inserted */
-        card_go = 0;
-
-        while ( !card_go )
+    /* some sanity checks */
+    uint8_t card_go = 0;
+    while(!card_go) {
+      if(disk_status(0) & (STA_NOINIT|STA_NODISK))
      {
-            if ( disk_status( 0 ) & ( STA_NOINIT | STA_NODISK ) )
-            {
-                snes_bootprint( "        No SD Card found!       \0" );
-
-                while ( disk_status( 0 ) & ( STA_NOINIT | STA_NODISK ) );
-
-                delay_ms( 200 );
+        snes_bootprint("        No SD Card found!       \0");
+        while(disk_status(0) & (STA_NOINIT|STA_NODISK));
+          delay_ms(200);
      }
-
-            file_open( ( uint8_t * )"/sd2snes/menu.bin", FA_READ );
-
-            if ( file_status != FILE_OK )
+      file_open((uint8_t*)"/sd2snes/menu.bin", FA_READ);
+      if(file_status != FILE_OK)
      {
-                snes_bootprint( "  /sd2snes/menu.bin not found!  \0" );
-
-                while ( disk_status( 0 ) == RES_OK );
+        snes_bootprint("  /sd2snes/menu.bin not found!  \0");
+        while(disk_status(0) == RES_OK);
      } 
      else
      {
-                /* Card found ! */
        card_go = 1;
      }
-
      file_close();
    }
-
-        snes_bootprint( "           Loading ...          \0" );
-
-        if ( get_cic_state() == CIC_PAIR )
-        {
-            printf( "PAIR MODE ENGAGED!\n" );
-            cic_pair( CIC_NTSC, CIC_NTSC );
+    snes_bootprint("           Loading ...          \0");
+    if(get_cic_state() == CIC_PAIR) {
+      printf("PAIR MODE ENGAGED!\n");
+      cic_pair(CIC_NTSC, CIC_NTSC);
    }
+    rdyled(1);
+    readled(0);
+    writeled(0);

-        rdyled( 1 );
-        readled( 0 );
-        writeled( 0 );
-
-        /* Load user config */
    cfg_load();
    cfg_save();
+    sram_writebyte(cfg_is_last_game_valid(), SRAM_STATUS_ADDR+SYS_LAST_STATUS);
+    cfg_get_last_game(file_lfn);
+    sram_writeblock(strrchr((const char*)file_lfn, '/')+1, SRAM_LASTGAME_ADDR, 256);
+    *fs_path=0;
+    uint32_t saved_dir_id;
+    get_db_id(&saved_dir_id);

-        sram_writebyte( cfg_is_last_game_valid(), SRAM_STATUS_ADDR + SYS_LAST_STATUS );
-
-        cfg_get_last_game( file_lfn );
-        sram_writeblock( strrchr( ( const char * )file_lfn, '/' ) + 1, SRAM_LASTGAME_ADDR, 256 );
-
-        *fs_path = 0;
-
-        get_db_id( &saved_dir_id );
-
-        mem_dir_id = sram_readlong( SRAM_DIRID );
-        mem_magic = sram_readlong( SRAM_SCRATCHPAD );
-
-        printf( "mem_magic=%lx mem_dir_id=%lx saved_dir_id=%lx\n", mem_magic, mem_dir_id, saved_dir_id );
-
-        if ( ( mem_magic != 0x12345678 ) || ( mem_dir_id != saved_dir_id ) || ( newcard ) )
-        {
+    uint32_t mem_dir_id = sram_readlong(SRAM_DIRID);
+    uint32_t mem_magic = sram_readlong(SRAM_SCRATCHPAD);
+    printf("mem_magic=%lx mem_dir_id=%lx saved_dir_id=%lx\n", mem_magic, mem_dir_id, saved_dir_id);
+    if((mem_magic != 0x12345678) || (mem_dir_id != saved_dir_id) || (newcard)) {
      newcard = 0;
      /* generate fs footprint (interesting files only) */
-            uint32_t curr_dir_id = scan_dir( fs_path, NULL, 0, 0 );
-
-            printf( "curr dir id = %lx\n", curr_dir_id );
-
+      uint32_t curr_dir_id = scan_dir(fs_path, NULL, 0, 0);
+      printf("curr dir id = %lx\n", curr_dir_id);
      /* files changed or no database found? */
-            if ( ( get_db_id( &saved_dir_id ) != FR_OK ) || saved_dir_id != curr_dir_id )
-            {
-                uint32_t endaddr, direndaddr;
+      if((get_db_id(&saved_dir_id) != FR_OK)
+	|| saved_dir_id != curr_dir_id) {
 	/* rebuild database */
-                printf( "saved dir id = %lx\n", saved_dir_id );
-                printf( "rebuilding database..." );
-                snes_bootprint( "     rebuilding database ...    \0" );
-                curr_dir_id = scan_dir( fs_path, NULL, 1, 0 );
-                sram_writeblock( &curr_dir_id, SRAM_DB_ADDR, 4 );
-                sram_readblock( &endaddr, SRAM_DB_ADDR + 4, 4 );
-                sram_readblock( &direndaddr, SRAM_DB_ADDR + 8, 4 );
-                printf( "%lx %lx\n", endaddr, direndaddr );
-                printf( "sorting database..." );
-                snes_bootprint( "       sorting database ...     \0" );
-                sort_all_dir( direndaddr );
-                printf( "done\n" );
-                snes_bootprint( "        saving database ...     \0" );
-                save_sram( ( uint8_t * )"/sd2snes/sd2snes.db", endaddr - SRAM_DB_ADDR, SRAM_DB_ADDR );
-                save_sram( ( uint8_t * )"/sd2snes/sd2snes.dir", direndaddr - ( SRAM_DIR_ADDR ), SRAM_DIR_ADDR );
-                fpga_pgm( ( uint8_t * )"/sd2snes/fpga_base.bit" );
-                printf( "done\n" );
+	printf("saved dir id = %lx\n", saved_dir_id);
+	printf("rebuilding database...");
+	snes_bootprint("     rebuilding database ...    \0");
+	curr_dir_id = scan_dir(fs_path, NULL, 1, 0);
+	sram_writeblock(&curr_dir_id, SRAM_DB_ADDR, 4);
+	uint32_t endaddr, direndaddr;
+	sram_readblock(&endaddr, SRAM_DB_ADDR+4, 4);
+	sram_readblock(&direndaddr, SRAM_DB_ADDR+8, 4);
+	printf("%lx %lx\n", endaddr, direndaddr);
+	printf("sorting database...");
+	snes_bootprint("       sorting database ...     \0");
+	sort_all_dir(direndaddr);
+	printf("done\n");
+	snes_bootprint("        saving database ...     \0");
+	save_sram((uint8_t*)"/sd2snes/sd2snes.db", endaddr-SRAM_DB_ADDR, SRAM_DB_ADDR);
+	save_sram((uint8_t*)"/sd2snes/sd2snes.dir", direndaddr-(SRAM_DIR_ADDR), SRAM_DIR_ADDR);
+        fpga_pgm((uint8_t*)"/sd2snes/fpga_base.bit");
+	printf("done\n");
+      } else {
+	printf("saved dir id = %lx\n", saved_dir_id);
+	printf("different card, consistent db, loading db...\n");
+        fpga_pgm((uint8_t*)"/sd2snes/fpga_base.bit");
+	load_sram_offload((uint8_t*)"/sd2snes/sd2snes.db", SRAM_DB_ADDR);
+	load_sram_offload((uint8_t*)"/sd2snes/sd2snes.dir", SRAM_DIR_ADDR);
      }
-            else
-            {
-                printf( "saved dir id = %lx\n", saved_dir_id );
-                printf( "different card, consistent db, loading db...\n" );
-                fpga_pgm( ( uint8_t * )"/sd2snes/fpga_base.bit" );
-                load_sram_offload( ( uint8_t * )"/sd2snes/sd2snes.db", SRAM_DB_ADDR );
-                load_sram_offload( ( uint8_t * )"/sd2snes/sd2snes.dir", SRAM_DIR_ADDR );
+      sram_writelong(curr_dir_id, SRAM_DIRID);
+      sram_writelong(0x12345678, SRAM_SCRATCHPAD);
+    } else {
+      snes_bootprint("    same card, loading db...     \0");
+      printf("same card, loading db...\n");
+      fpga_pgm((uint8_t*)"/sd2snes/fpga_base.bit");
+      load_sram_offload((uint8_t*)"/sd2snes/sd2snes.db", SRAM_DB_ADDR);
+      load_sram_offload((uint8_t*)"/sd2snes/sd2snes.dir", SRAM_DIR_ADDR);
    }
-
-            sram_writelong( curr_dir_id, SRAM_DIRID );
-            sram_writelong( 0x12345678, SRAM_SCRATCHPAD );
-        }
-        else
-        {
-            snes_bootprint( "    same card, loading db...     \n" );
-            fpga_pgm( ( uint8_t * )"/sd2snes/fpga_base.bit" );
-            load_sram_offload( ( uint8_t * )"/sd2snes/sd2snes.db", SRAM_DB_ADDR );
-            load_sram_offload( ( uint8_t * )"/sd2snes/sd2snes.dir", SRAM_DIR_ADDR );
-        }
-
    /* cli_loop(); */
    /* load menu */

-        fpga_dspx_reset( 1 );
-        uart_putc( '(' );
-        uart_putcrlf();
-        load_rom( ( uint8_t * )"/sd2snes/menu.bin", SRAM_MENU_ADDR, 0 );
+    fpga_dspx_reset(1);
+    uart_putc('(');
+    load_rom((uint8_t*)"/sd2snes/menu.bin", SRAM_MENU_ADDR, 0);
    /* force memory size + mapper */
-        set_rom_mask( 0x3fffff );
-        set_mapper( 0x7 );
-        uart_putc( ')' );
+    set_rom_mask(0x3fffff);
+    set_mapper(0x7);
+    uart_putc(')');
    uart_putcrlf();

-        sram_writebyte( 0, SRAM_CMD_ADDR );
+    sram_writebyte(0, SRAM_CMD_ADDR);

-        snes_bootprint( "    same card, loading db...     \n" );
-
-
-        if ( ( rtc_state = rtc_isvalid() ) != RTC_OK )
-        {
-            printf( "RTC invalid!\n" );
-            sram_writebyte( 0xff, SRAM_STATUS_ADDR + SYS_RTC_STATUS );
-            set_bcdtime( 0x20120701000000LL );
-            set_fpga_time( 0x20120701000000LL );
+    if((rtc_state = rtc_isvalid()) != RTC_OK) {
+      printf("RTC invalid!\n");
+      sram_writebyte(0xff, SRAM_STATUS_ADDR+SYS_RTC_STATUS);
+      set_bcdtime(0x20120701000000LL);
+      set_fpga_time(0x20120701000000LL);
      invalidate_rtc();
+    } else {
+      printf("RTC valid!\n");
+      sram_writebyte(0x00, SRAM_STATUS_ADDR+SYS_RTC_STATUS);
+      set_fpga_time(get_bcdtime());
    }
-        else
-        {
-            printf( "RTC valid!\n" );
-            sram_writebyte( 0x00, SRAM_STATUS_ADDR + SYS_RTC_STATUS );
-            set_fpga_time( get_bcdtime() );
-        }
-
-        sram_memset( SRAM_SYSINFO_ADDR, 13 * 40, 0x20 );
-        printf( "SNES GO!\n" );
-        snes_reset( 1 );
+    sram_memset(SRAM_SYSINFO_ADDR, 13*40, 0x20);
+    printf("SNES GO!\n");
+    snes_reset(1);
    fpga_reset_srtc_state();
-        delay_ms( SNES_RESET_PULSELEN_MS );
-        sram_writebyte( 32, SRAM_CMD_ADDR );
-        snes_reset( 0 );
+    delay_ms(SNES_RESET_PULSELEN_MS);
+    sram_writebyte(32, SRAM_CMD_ADDR);
+    snes_reset(0);

-        cmd = 0;
-        btime = 0;
-        filesize = 0;
-
-        printf( "test sram... " );
-
-        while ( !sram_reliable() )
-        {
-            cli_entrycheck();
-        }
-
-        printf( "ok\nWaiting command from menu...\n" );
-
-        //while(1) {
-        //  delay_ms(1000);
-        //  printf("Estimated SNES master clock: %ld Hz\n", get_snes_sysclk());
-        //}
+    uint8_t cmd = 0;
+    uint64_t btime = 0;
+    uint32_t filesize=0;
+    printf("test sram\n");
+    while(!sram_reliable()) cli_entrycheck();
+    printf("ok\n");
+//while(1) {
+//  delay_ms(1000);
+//  printf("Estimated SNES master clock: %ld Hz\n", get_snes_sysclk());
+//}
  //sram_hexdump(SRAM_DB_ADDR, 0x200);
  //sram_hexdump(SRAM_MENU_ADDR, 0x400);
-
-        while ( !cmd )
-        {
-            cmd = menu_main_loop();
-            printf( "cmd: %d\n", cmd );
-
-            switch ( cmd )
-            {
+    while(!cmd) {
+      cmd=menu_main_loop();
+      printf("cmd: %d\n", cmd);
+      uart_putc('-');
+      switch(cmd) {
 	case SNES_CMD_LOADROM:
-                get_selected_name( file_lfn );
-                printf( "Selected name: %s\n", file_lfn );
-                cfg_save_last_game( file_lfn );
-                cfg_set_last_game_valid( 1 );
+	  get_selected_name(file_lfn);
+	  printf("Selected name: %s\n", file_lfn);
+          cfg_save_last_game(file_lfn);
+          cfg_set_last_game_valid(1);
          cfg_save();
-                filesize = load_rom( file_lfn, SRAM_ROM_ADDR, LOADROM_WITH_SRAM | LOADROM_WITH_RESET );
-                printf( "Filesize = %lu\n", filesize );
+	  filesize = load_rom(file_lfn, SRAM_ROM_ADDR, LOADROM_WITH_SRAM | LOADROM_WITH_RESET);
+	  printf("Filesize = %lu\n", filesize);
 	  break;
-
 	case SNES_CMD_SETRTC:
          /* get time from RAM */
-                btime = sram_gettime( SRAM_PARAM_ADDR );
+          btime = sram_gettime(SRAM_PARAM_ADDR);
          /* set RTC */
-                set_bcdtime( btime );
-                set_fpga_time( btime );
-                cmd = 0; /* stay in menu loop */
+          set_bcdtime(btime);
+          set_fpga_time(btime);
+	  cmd=0; /* stay in menu loop */
 	  break;
-
        case SNES_CMD_SYSINFO:
          /* go to sysinfo loop */
          sysinfo_loop();
-                cmd = 0; /* stay in menu loop */
+          cmd=0; /* stay in menu loop */
          break;
-
        case SNES_CMD_LOADSPC:
          /* load SPC file */
-                get_selected_name( file_lfn );
-                printf( "Selected name: %s\n", file_lfn );
-                filesize = load_spc( file_lfn, SRAM_SPC_DATA_ADDR, SRAM_SPC_HEADER_ADDR );
-                cmd = 0; /* stay in menu loop */
+          get_selected_name(file_lfn);
+          printf("Selected name: %s\n", file_lfn);
+          filesize = load_spc(file_lfn, SRAM_SPC_DATA_ADDR, SRAM_SPC_HEADER_ADDR);
+          cmd=0; /* stay in menu loop */
          break;
-
        case SNES_CMD_RESET:
          /* process RESET request from SNES */
-                printf( "RESET requested by SNES\n" );
+          printf("RESET requested by SNES\n");
          snes_reset_pulse();
-                cmd = 0; /* stay in menu loop */
+          cmd=0; /* stay in menu loop */
          break;
-
        case SNES_CMD_LOADLAST:
-                cfg_get_last_game( file_lfn );
-                printf( "Selected name: %s\n", file_lfn );
-                filesize = load_rom( file_lfn, SRAM_ROM_ADDR, LOADROM_WITH_SRAM | LOADROM_WITH_RESET );
+          cfg_get_last_game(file_lfn);
+          printf("Selected name: %s\n", file_lfn);
+          filesize = load_rom(file_lfn, SRAM_ROM_ADDR, LOADROM_WITH_SRAM | LOADROM_WITH_RESET);
          break;
-
 	default:
-                printf( "unknown cmd: %d\n", cmd );
-                cmd = 0; /* unknown cmd: stay in loop */
+	  printf("unknown cmd: %d\n", cmd);
+	  cmd=0; /* unknown cmd: stay in loop */
 	  break;
      }
    }
+    printf("loaded %lu bytes\n", filesize);
+    printf("cmd was %x, going to snes main loop\n", cmd);

-        printf( "loaded %lu bytes\n", filesize );
-        printf( "cmd was %x, going to snes main loop\n", cmd );
-
-        if ( romprops.has_msu1 )
-        {
-            while ( !msu1_loop() );
-
+    if(romprops.has_msu1) {
+      while(!msu1_loop());
      prepare_reset();
      continue;
    }

-        cmd = 0;
-        snes_reset_prev = 0;
-        snes_reset_now = 0;
-        snes_reset_state = 0;
-        reset_count = 0;
-
-        while ( fpga_test() == FPGA_TEST_TOKEN )
+    cmd=0;
+    uint8_t snes_reset_prev=0, snes_reset_now=0, snes_reset_state=0;
+    uint16_t reset_count=0;
+    while(fpga_test() == FPGA_TEST_TOKEN)
    {
      cli_entrycheck();
-            sleep_ms( 250 );
+      sleep_ms(250);
      sram_reliable();
-            printf( "%s ", get_cic_statename( get_cic_state() ) );
-
-            if ( reset_changed )
+      printf("%s ", get_cic_statename(get_cic_state()));
+      if(reset_changed)
      {
-                printf( "reset\n" );
+        printf("reset\n");
        reset_changed = 0;
        fpga_reset_srtc_state();
      }
-
      snes_reset_now = get_snes_reset();
-
-            if ( snes_reset_now )
+      if (snes_reset_now)
      {
-                if ( !snes_reset_prev )
+        if (!snes_reset_prev)
        {
-                    printf( "RESET BUTTON DOWN\n" );
+          printf("RESET BUTTON DOWN\n");
          snes_reset_state = 1;
          reset_count = 0;
        }
      } 
      else
      {
-                if ( snes_reset_prev )
+        if (snes_reset_prev)
        {
-                    printf( "RESET BUTTON UP\n" );
+          printf("RESET BUTTON UP\n");
          snes_reset_state = 0;
        }
      }
-
-            if ( snes_reset_state )
+      if (snes_reset_state)
      {
 	reset_count++;
-            }
-            else
-            {
+      } else {
 	sram_reliable();
 	snes_main_loop();
      }
-
-            if ( reset_count > 4 )
-            {
-                reset_count = 0;
+      if(reset_count>4) {
+	reset_count=0;
        prepare_reset();
 	break;
      }
-
      snes_reset_prev = snes_reset_now;
    }
-
    /* fpga test fail: panic */
-        if ( fpga_test() != FPGA_TEST_TOKEN )
-        {
-            led_panic();
+    if(fpga_test() != FPGA_TEST_TOKEN){
+      led_panic(LED_PANIC_FPGA_DEAD);
    }
-
    /* else reset */
  }
 }
--- a/src/memory.c
+++ b/src/memory.c
--- a/src/memory.h
+++ b/src/memory.h
@ -31,27 +31,7 @@
 #include "smc.h"

 #define MASK_BITS                (0x000000)
-#if 0
-#define SRAM_ROM_ADDR           ((0x000000L) & ~MASK_BITS)
-#define SRAM_SAVE_ADDR          ((0x400000L) & ~MASK_BITS)

-#define SRAM_MENU_ADDR          ((0x7A0000L) & ~MASK_BITS)
-#define SRAM_DIR_ADDR           ((0x410000L) & ~MASK_BITS)
-#define SRAM_DB_ADDR            ((0x420000L) & ~MASK_BITS)
-
-#define SRAM_SPC_DATA_ADDR      ((0x430000L) & ~MASK_BITS)
-#define SRAM_SPC_HEADER_ADDR    ((0x440000L) & ~MASK_BITS)
-
-#define SRAM_MENU_SAVE_ADDR     ((0x7F0000L) & ~MASK_BITS)
-#define SRAM_CMD_ADDR           ((0x7F1000L) & ~MASK_BITS)
-#define SRAM_PARAM_ADDR         ((0x7F1004L) & ~MASK_BITS)
-#define SRAM_STATUS_ADDR        ((0x7F1100L) & ~MASK_BITS)
-#define SRAM_SYSINFO_ADDR       ((0x7F1200L) & ~MASK_BITS)
-#define SRAM_LASTGAME_ADDR      ((0x7F1420L) & ~MASK_BITS)
-#define SRAM_SCRATCHPAD         ((0x7FFF00L) & ~MASK_BITS)
-#define SRAM_DIRID              ((0x7FFFF0L) & ~MASK_BITS)
-#define SRAM_RELIABILITY_SCORE  (0x100)
-#else
 #define SRAM_ROM_ADDR           ((0x000000L) & ~MASK_BITS)
 #define SRAM_SAVE_ADDR          ((0x600000L) & ~MASK_BITS)

@ -71,33 +51,32 @@
 #define SRAM_SCRATCHPAD         ((0x7FFF00L) & ~MASK_BITS)
 #define SRAM_DIRID              ((0x7FFFF0L) & ~MASK_BITS)
 #define SRAM_RELIABILITY_SCORE  (0x100)
-#endif
-

 #define LOADROM_WITH_SRAM	(1)
 #define LOADROM_WITH_RESET	(2)

-uint32_t load_rom( uint8_t *filename, uint32_t base_addr, uint8_t flags );
-uint32_t load_spc( uint8_t *filename, uint32_t spc_data_addr, uint32_t spc_header_addr );
-uint32_t load_sram( uint8_t *filename, uint32_t base_addr );
-uint32_t load_sram_offload( uint8_t *filename, uint32_t base_addr );
-uint32_t load_sram_rle( uint8_t *filename, uint32_t base_addr );
-uint32_t load_bootrle( uint32_t base_addr );
-void load_dspx( const uint8_t *filename, uint8_t st0010 );
-void sram_hexdump( uint32_t addr, uint32_t len );
-uint8_t sram_readbyte( uint32_t addr );
-uint16_t sram_readshort( uint32_t addr );
-uint32_t sram_readlong( uint32_t addr );
-void sram_writebyte( uint8_t val, uint32_t addr );
-void sram_writeshort( uint16_t val, uint32_t addr );
-void sram_writelong( uint32_t val, uint32_t addr );
-void sram_readblock( void *buf, uint32_t addr, uint16_t size );
-void sram_readlongblock( uint32_t *buf, uint32_t addr, uint16_t count );
-void sram_writeblock( void *buf, uint32_t addr, uint16_t size );
-void save_sram( uint8_t *filename, uint32_t sram_size, uint32_t base_addr );
-uint32_t calc_sram_crc( uint32_t base_addr, uint32_t size );
-uint8_t sram_reliable( void );
-void sram_memset( uint32_t base_addr, uint32_t len, uint8_t val );
-uint64_t sram_gettime( uint32_t base_addr );
-void sram_readstrn( void *buf, uint32_t addr, uint16_t size );
+uint32_t load_rom(uint8_t* filename, uint32_t base_addr, uint8_t flags);
+uint32_t load_spc(uint8_t* filename, uint32_t spc_data_addr, uint32_t spc_header_addr);
+uint32_t load_sram(uint8_t* filename, uint32_t base_addr);
+uint32_t load_sram_offload(uint8_t* filename, uint32_t base_addr);
+uint32_t load_sram_rle(uint8_t* filename, uint32_t base_addr);
+uint32_t load_bootrle(uint32_t base_addr);
+void load_dspx(const uint8_t* filename, uint8_t st0010);
+void sram_hexdump(uint32_t addr, uint32_t len);
+uint8_t sram_readbyte(uint32_t addr);
+uint16_t sram_readshort(uint32_t addr);
+uint32_t sram_readlong(uint32_t addr);
+void sram_writebyte(uint8_t val, uint32_t addr);
+void sram_writeshort(uint16_t val, uint32_t addr);
+void sram_writelong(uint32_t val, uint32_t addr);
+void sram_readblock(void* buf, uint32_t addr, uint16_t size);
+void sram_readstrn(void* buf, uint32_t addr, uint16_t size);
+void sram_readlongblock(uint32_t* buf, uint32_t addr, uint16_t count);
+void sram_writeblock(void* buf, uint32_t addr, uint16_t size);
+void save_sram(uint8_t* filename, uint32_t sram_size, uint32_t base_addr);
+uint32_t calc_sram_crc(uint32_t base_addr, uint32_t size);
+uint8_t sram_reliable(void);
+void sram_memset(uint32_t base_addr, uint32_t len, uint8_t val);
+uint64_t sram_gettime(uint32_t base_addr);
+
 #endif
--- a/src/msu1.c
+++ b/src/msu1.c
@ -29,183 +29,139 @@ uint16_t fpga_status_now;

 enum msu_reset_state { MSU_RESET_NONE = 0, MSU_RESET_SHORT, MSU_RESET_LONG };

-void prepare_audio_track( uint16_t msu_track )
-{
+void prepare_audio_track(uint16_t msu_track) {
  /* open file, fill buffer */
  char suffix[11];
-    f_close( &file_handle );
-    snprintf( suffix, sizeof( suffix ), "-%d.pcm", msu_track );
-    strcpy( ( char * )file_buf, ( char * )file_lfn );
-    strcpy( strrchr( ( char * )file_buf, ( int )'.' ), suffix );
-    DBG_MSU1 printf( "filename: %s\n", file_buf );
-
-    if ( f_open( &file_handle, ( const TCHAR * )file_buf, FA_READ ) == FR_OK )
-    {
+  f_close(&file_handle);
+  snprintf(suffix, sizeof(suffix), "-%d.pcm", msu_track);
+  strcpy((char*)file_buf, (char*)file_lfn);
+  strcpy(strrchr((char*)file_buf, (int)'.'), suffix);
+  DBG_MSU1 printf("filename: %s\n", file_buf);
+  if(f_open(&file_handle, (const TCHAR*)file_buf, FA_READ) == FR_OK) {
    file_handle.cltbl = pcm_cltbl;
    pcm_cltbl[0] = CLTBL_SIZE;
-        f_lseek( &file_handle, CREATE_LINKMAP );
-        f_lseek( &file_handle, 4L );
-        f_read( &file_handle, &msu_loop_point, 4, &msu_audio_bytes_read );
-        DBG_MSU1 printf( "loop point: %ld samples\n", msu_loop_point );
-        ff_sd_offload = 1;
-        sd_offload_tgt = 1;
-        f_lseek( &file_handle, 8L );
-        set_dac_addr( 0 );
+    f_lseek(&file_handle, CREATE_LINKMAP);
+    f_lseek(&file_handle, 4L);
+    f_read(&file_handle, &msu_loop_point, 4, &msu_audio_bytes_read);
+    DBG_MSU1 printf("loop point: %ld samples\n", msu_loop_point);
+    ff_sd_offload=1;
+    sd_offload_tgt=1;
+    f_lseek(&file_handle, 8L);
+    set_dac_addr(0);
    dac_pause();
    dac_reset();
-        ff_sd_offload = 1;
-        sd_offload_tgt = 1;
-        f_read( &file_handle, file_buf, MSU_DAC_BUFSIZE, &msu_audio_bytes_read );
+    ff_sd_offload=1;
+    sd_offload_tgt=1;
+    f_read(&file_handle, file_buf, MSU_DAC_BUFSIZE, &msu_audio_bytes_read);
    /* clear busy bit */
-        set_msu_status( 0x00, 0x28 ); /* set no bits, reset audio_busy + audio_error */
-    }
-    else
-    {
-        f_close( &file_handle );
-        set_msu_status( 0x08, 0x20 ); /* reset audio_busy, set audio_error */
+    set_msu_status(0x00, 0x28); /* set no bits, reset audio_busy + audio_error */
+  } else {
+    f_close(&file_handle);
+    set_msu_status(0x08, 0x20); /* reset audio_busy, set audio_error */
  }
 }

-void prepare_data( uint32_t msu_offset )
-{
-    DBG_MSU1 printf( "Data requested! Offset=%08lx page1=%08lx page2=%08lx\n", msu_offset, msu_page1_start,
-                     msu_page2_start );
-
-    if (   ( ( msu_offset < msu_page1_start )
-             || ( msu_offset >= msu_page1_start + msu_page_size ) )
-            && ( ( msu_offset < msu_page2_start )
-                 || ( msu_offset >= msu_page2_start + msu_page_size ) ) )
-    {
-        DBG_MSU1 printf( "offset %08lx out of range (%08lx-%08lx, %08lx-%08lx), reload\n", msu_offset, msu_page1_start,
-                         msu_page1_start + msu_page_size - 1, msu_page2_start, msu_page2_start + msu_page_size - 1 );
+void prepare_data(uint32_t msu_offset) {
+  DBG_MSU1 printf("Data requested! Offset=%08lx page1=%08lx page2=%08lx\n", msu_offset, msu_page1_start, msu_page2_start);
+  if(   ((msu_offset < msu_page1_start)
+     || (msu_offset >= msu_page1_start + msu_page_size))
+     && ((msu_offset < msu_page2_start)
+     || (msu_offset >= msu_page2_start + msu_page_size))) {
+    DBG_MSU1 printf("offset %08lx out of range (%08lx-%08lx, %08lx-%08lx), reload\n", msu_offset, msu_page1_start,
+           msu_page1_start+msu_page_size-1, msu_page2_start, msu_page2_start+msu_page_size-1);
    /* "cache miss" */
    /* fill buffer */
-        set_msu_addr( 0x0 );
-        sd_offload_tgt = 2;
-        ff_sd_offload = 1;
-        msu_res = f_lseek( &msufile, msu_offset );
-        DBG_MSU1 printf( "seek to %08lx, res = %d\n", msu_offset, msu_res );
-        sd_offload_tgt = 2;
-        ff_sd_offload = 1;
-        msu_res = f_read( &msufile, file_buf, 16384, &msu_data_bytes_read );
-        DBG_MSU1 printf( "read res = %d\n", msu_res );
-        DBG_MSU1 printf( "read %d bytes\n", msu_data_bytes_read );
-        msu_reset( 0x0 );
+    set_msu_addr(0x0);
+    sd_offload_tgt=2;
+    ff_sd_offload=1;
+    msu_res = f_lseek(&msufile, msu_offset);
+    DBG_MSU1 printf("seek to %08lx, res = %d\n", msu_offset, msu_res);
+    sd_offload_tgt=2;
+    ff_sd_offload=1;
+    msu_res = f_read(&msufile, file_buf, 16384, &msu_data_bytes_read);
+    DBG_MSU1 printf("read res = %d\n", msu_res);
+    DBG_MSU1 printf("read %d bytes\n", msu_data_bytes_read);
+    msu_reset(0x0);
    msu_page1_start = msu_offset;
    msu_page2_start = msu_offset + msu_page_size;
-    }
-    else
-    {
-        if ( msu_offset >= msu_page1_start && msu_offset <= msu_page1_start + msu_page_size )
-        {
-            msu_reset( 0x0000 + msu_offset - msu_page1_start );
-            DBG_MSU1 printf( "inside page1, new offset: %08lx\n", 0x0000 + msu_offset - msu_page1_start );
-
-            if ( !( msu_page2_start == msu_page1_start + msu_page_size ) )
-            {
-                set_msu_addr( 0x2000 );
-                sd_offload_tgt = 2;
-                ff_sd_offload = 1;
-                f_read( &msufile, file_buf, 8192, &msu_data_bytes_read );
-                DBG_MSU1 printf( "next page dirty (was: %08lx), loaded page2 (start now: ", msu_page2_start );
+  } else {
+    if (msu_offset >= msu_page1_start && msu_offset <= msu_page1_start + msu_page_size) {
+      msu_reset(0x0000 + msu_offset - msu_page1_start);
+      DBG_MSU1 printf("inside page1, new offset: %08lx\n", 0x0000 + msu_offset-msu_page1_start);
+      if(!(msu_page2_start == msu_page1_start + msu_page_size)) {
+        set_msu_addr(0x2000);
+        sd_offload_tgt=2;
+        ff_sd_offload=1;
+        f_read(&msufile, file_buf, 8192, &msu_data_bytes_read);
+        DBG_MSU1 printf("next page dirty (was: %08lx), loaded page2 (start now: ", msu_page2_start);
        msu_page2_start = msu_page1_start + msu_page_size;
-                DBG_MSU1 printf( "%08lx)\n", msu_page2_start );
+        DBG_MSU1 printf("%08lx)\n", msu_page2_start);
      }
-        }
-        else if ( msu_offset >= msu_page2_start && msu_offset <= msu_page2_start + msu_page_size )
-        {
-            DBG_MSU1 printf( "inside page2, new offset: %08lx\n", 0x2000 + msu_offset - msu_page2_start );
-            msu_reset( 0x2000 + msu_offset - msu_page2_start );
-
-            if ( !( msu_page1_start == msu_page2_start + msu_page_size ) )
-            {
-                set_msu_addr( 0x0 );
-                sd_offload_tgt = 2;
-                ff_sd_offload = 1;
-                f_read( &msufile, file_buf, 8192, &msu_data_bytes_read );
-                DBG_MSU1 printf( "next page dirty (was: %08lx), loaded page1 (start now: ", msu_page1_start );
+    } else if (msu_offset >= msu_page2_start && msu_offset <= msu_page2_start + msu_page_size) {
+      DBG_MSU1 printf("inside page2, new offset: %08lx\n", 0x2000 + msu_offset-msu_page2_start);
+      msu_reset(0x2000 + msu_offset - msu_page2_start);
+      if(!(msu_page1_start == msu_page2_start + msu_page_size)) {
+        set_msu_addr(0x0);
+        sd_offload_tgt=2;
+        ff_sd_offload=1;
+        f_read(&msufile, file_buf, 8192, &msu_data_bytes_read);
+        DBG_MSU1 printf("next page dirty (was: %08lx), loaded page1 (start now: ", msu_page1_start);
        msu_page1_start = msu_page2_start + msu_page_size;
-                DBG_MSU1 printf( "%08lx)\n", msu_page1_start );
+        DBG_MSU1 printf("%08lx)\n", msu_page1_start);
      }
+    } else printf("!!!WATWATWAT!!!\n");
  }
-        else
-        {
-            printf( "!!!WATWATWAT!!!\n" );
-        }
-    }
-
  /* clear bank bit to mask bank reset artifact */
  fpga_status_now &= ~0x2000;
  fpga_status_prev &= ~0x2000;
  /* clear busy bit */
-    set_msu_status( 0x00, 0x10 );
+  set_msu_status(0x00, 0x10);
 }

-int msu1_check_reset( void )
-{
+int msu1_check_reset(void) {
  static tick_t rising_ticks;

-    static uint8_t resbutton = 0, resbutton_prev = 0;
+  static uint8_t resbutton=0, resbutton_prev=0;
  int result = MSU_RESET_NONE;
  resbutton = get_snes_reset();
-
-    if ( resbutton && !resbutton_prev ) /* push */
-    {
+  if(resbutton && !resbutton_prev) { /* push */
    rising_ticks = getticks();
-    }
-    else if ( resbutton && resbutton_prev )  /* hold */
-    {
-        if ( getticks() > rising_ticks + 99 )
-        {
+  } else if(resbutton && resbutton_prev) { /* hold */
+    if(getticks() > rising_ticks + 99) {
      result = MSU_RESET_LONG;
    }
-    }
-    else if ( !resbutton && resbutton_prev )  /* release */
-    {
-        if ( getticks() < rising_ticks + 99 )
-        {
+  } else if(!resbutton && resbutton_prev) { /* release */
+    if(getticks() < rising_ticks + 99) {
      result = MSU_RESET_SHORT;
    }
-    }
-    else
-    {
+  } else {
    result = MSU_RESET_NONE;
  }
-
  resbutton_prev = resbutton;
  return result;
 }

-int msu1_check( uint8_t *filename )
-{
-    /* open MSU file */
-    strcpy( ( char * )file_buf, ( char * )filename );
-    strcpy( strrchr( ( char * )file_buf, ( int )'.' ), ".msu" );
-    printf( "MSU datafile: %s\n", file_buf );
-
-    if ( f_open( &msufile, ( const TCHAR * )file_buf, FA_READ ) != FR_OK )
-    {
-        printf( "MSU datafile not found\n" );
+int msu1_check(uint8_t* filename) {
+/* open MSU file */
+  strcpy((char*)file_buf, (char*)filename);
+  strcpy(strrchr((char*)file_buf, (int)'.'), ".msu");
+  printf("MSU datafile: %s\n", file_buf);
+  if(f_open(&msufile, (const TCHAR*)file_buf, FA_READ) != FR_OK) {
+    printf("MSU datafile not found\n");
    return 0;
  }
-
  msufile.cltbl = msu_cltbl;
  msu_cltbl[0] = CLTBL_SIZE;
-
-    if ( f_lseek( &msufile, CREATE_LINKMAP ) )
-    {
-        printf( "Error creating FF linkmap for MSU file!\n" );
+  if(f_lseek(&msufile, CREATE_LINKMAP)) {
+    printf("Error creating FF linkmap for MSU file!\n");
  }
-
  romprops.fpga_features |= FEAT_MSU1;
  return 1;
 }

-int msu1_loop()
-{
-    /* it is assumed that the MSU file is already opened by calling msu1_check(). */
-    while ( fpga_status() & 0x4000 );
-
+int msu1_loop() {
+/* it is assumed that the MSU file is already opened by calling msu1_check(). */
+  while(fpga_status() & 0x4000);
  uint16_t dac_addr = 0;
  uint16_t msu_addr = 0;
  uint8_t msu_repeat = 0;
@ -215,7 +171,7 @@ int msu1_loop()
  fpga_status_now = fpga_status();
  int msu_res;

-    /*  set_msu_addr(0x0);
+/*  set_msu_addr(0x0);
  msu_reset(0x0);
  ff_sd_offload=1;
  sd_offload_tgt=2;
@ -223,111 +179,89 @@ int msu1_loop()
  ff_sd_offload=1;
  sd_offload_tgt=2;
  f_read(&msufile, file_buf, 16384, &msu_data_bytes_read);
-    */
-    set_dac_addr( dac_addr );
+*/
+  set_dac_addr(dac_addr);
  dac_pause();
  dac_reset();

-    set_msu_addr( 0x0 );
-    msu_reset( 0x0 );
-    ff_sd_offload = 1;
-    sd_offload_tgt = 2;
-    f_lseek( &msufile, 0L );
-    ff_sd_offload = 1;
-    sd_offload_tgt = 2;
-    f_read( &msufile, file_buf, 16384, &msu_data_bytes_read );
+  set_msu_addr(0x0);
+  msu_reset(0x0);
+  ff_sd_offload=1;
+  sd_offload_tgt=2;
+  f_lseek(&msufile, 0L);
+  ff_sd_offload=1;
+  sd_offload_tgt=2;
+  f_read(&msufile, file_buf, 16384, &msu_data_bytes_read);

-    prepare_audio_track( 0 );
-    prepare_data( 0 );
-
-    /* audio_start, data_start, 0, audio_ctrl[1:0], ctrl_start */
-    while ( ( msu_res = msu1_check_reset() ) == MSU_RESET_NONE )
-    {
+  prepare_audio_track(0);
+  prepare_data(0);
+/* audio_start, data_start, 0, audio_ctrl[1:0], ctrl_start */
+  while((msu_res = msu1_check_reset()) == MSU_RESET_NONE){
    cli_entrycheck();
    fpga_status_now = fpga_status();

    /* Data buffer refill */
-        if ( ( fpga_status_now & 0x2000 ) != ( fpga_status_prev & 0x2000 ) )
-        {
-            DBG_MSU1 printf( "data\n" );
-
-            if ( fpga_status_now & 0x2000 )
-            {
+    if((fpga_status_now & 0x2000) != (fpga_status_prev & 0x2000)) {
+      DBG_MSU1 printf("data\n");
+      if(fpga_status_now & 0x2000) {
        msu_addr = 0x0;
        msu_page1_start = msu_page2_start + msu_page_size;
-            }
-            else
-            {
+      } else {
        msu_addr = 0x2000;
        msu_page2_start = msu_page1_start + msu_page_size;
      }
-
-            set_msu_addr( msu_addr );
-            sd_offload_tgt = 2;
-            ff_sd_offload = 1;
-            msu_res = f_read( &msufile, file_buf, 8192, &msu_data_bytes_read );
-            DBG_MSU1 printf( "data buffer refilled. res=%d page1=%08lx page2=%08lx\n", msu_res, msu_page1_start, msu_page2_start );
+      set_msu_addr(msu_addr);
+      sd_offload_tgt=2;
+      ff_sd_offload=1;
+      msu_res = f_read(&msufile, file_buf, 8192, &msu_data_bytes_read);
+      DBG_MSU1 printf("data buffer refilled. page=%d res=%d page1=%08lx page2=%08lx\n", pageno, msu_res, msu_page1_start, msu_page2_start);
    }

    /* Audio buffer refill */
-        if ( ( fpga_status_now & 0x4000 ) != ( fpga_status_prev & 0x4000 ) )
-        {
-            if ( fpga_status_now & 0x4000 )
-            {
+    if((fpga_status_now & 0x4000) != (fpga_status_prev & 0x4000)) {
+      if(fpga_status_now & 0x4000) {
        dac_addr = 0;
+      } else {
+        dac_addr = MSU_DAC_BUFSIZE/2;
      }
-            else
-            {
-                dac_addr = MSU_DAC_BUFSIZE / 2;
+      set_dac_addr(dac_addr);
+      sd_offload_tgt=1;
+      ff_sd_offload=1;
+      f_read(&file_handle, file_buf, MSU_DAC_BUFSIZE/2, &msu_audio_bytes_read);
    }

-            set_dac_addr( dac_addr );
-            sd_offload_tgt = 1;
-            ff_sd_offload = 1;
-            f_read( &file_handle, file_buf, MSU_DAC_BUFSIZE / 2, &msu_audio_bytes_read );
-        }
-
-        if ( fpga_status_now & 0x0020 )
-        {
+    if(fpga_status_now & 0x0020) {
      /* get trackno */
      msu_track = get_msu_track();
-            DBG_MSU1 printf( "Audio requested! Track=%d\n", msu_track );
+      DBG_MSU1 printf("Audio requested! Track=%d\n", msu_track);

-            prepare_audio_track( msu_track );
+      prepare_audio_track(msu_track);
    }

-        if ( fpga_status_now & 0x0010 )
-        {
+    if(fpga_status_now & 0x0010) {
      /* get address */
-            msu_offset = get_msu_offset();
-            prepare_data( msu_offset );
+      msu_offset=get_msu_offset();
+      prepare_data(msu_offset);
    }

-        if ( fpga_status_now & 0x0001 )
-        {
-            if ( fpga_status_now & 0x0004 )
-            {
+    if(fpga_status_now & 0x0001) {
+      if(fpga_status_now & 0x0004) {
        msu_repeat = 1;
-                set_msu_status( 0x04, 0x01 ); /* set bit 2, reset bit 0 */
-                DBG_MSU1 printf( "Repeat set!\n" );
-            }
-            else
-            {
+        set_msu_status(0x04, 0x01); /* set bit 2, reset bit 0 */
+        DBG_MSU1 printf("Repeat set!\n");
+      } else {
        msu_repeat = 0;
-                set_msu_status( 0x00, 0x05 ); /* set no bits, reset bit 0+2 */
-                DBG_MSU1 printf( "Repeat clear!\n" );
+        set_msu_status(0x00, 0x05); /* set no bits, reset bit 0+2 */
+        DBG_MSU1 printf("Repeat clear!\n");
      }

-            if ( fpga_status_now & 0x0002 )
-            {
-                DBG_MSU1 printf( "PLAY!\n" );
-                set_msu_status( 0x02, 0x01 ); /* set bit 0, reset bit 1 */
+      if(fpga_status_now & 0x0002) {
+        DBG_MSU1 printf("PLAY!\n");
+        set_msu_status(0x02, 0x01); /* set bit 0, reset bit 1 */
        dac_play();
-            }
-            else
-            {
-                DBG_MSU1 printf( "PAUSE!\n" );
-                set_msu_status( 0x00, 0x03 ); /* set no bits, reset bit 1+0 */
+      } else {
+        DBG_MSU1 printf("PAUSE!\n");
+        set_msu_status(0x00, 0x03); /* set no bits, reset bit 1+0 */
        dac_pause();
      }
    }
@ -335,42 +269,32 @@ int msu1_loop()
    fpga_status_prev = fpga_status_now;

    /* handle loop / end */
-        if ( msu_audio_bytes_read < MSU_DAC_BUFSIZE / 2 )
-        {
-            ff_sd_offload = 0;
-            sd_offload = 0;
-
-            if ( msu_repeat )
-            {
-                DBG_MSU1 printf( "loop\n" );
-                ff_sd_offload = 1;
-                sd_offload_tgt = 1;
-                f_lseek( &file_handle, 8L + msu_loop_point * 4 );
-                ff_sd_offload = 1;
-                sd_offload_tgt = 1;
-                f_read( &file_handle, file_buf, ( MSU_DAC_BUFSIZE / 2 ) - msu_audio_bytes_read, &msu_audio_bytes_read );
-            }
-            else
-            {
-                set_msu_status( 0x00, 0x02 ); /* clear play bit */
+    if(msu_audio_bytes_read < MSU_DAC_BUFSIZE / 2) {
+      ff_sd_offload=0;
+      sd_offload=0;
+      if(msu_repeat) {
+        DBG_MSU1 printf("loop\n");
+        ff_sd_offload=1;
+        sd_offload_tgt=1;
+        f_lseek(&file_handle, 8L+msu_loop_point*4);
+        ff_sd_offload=1;
+        sd_offload_tgt=1;
+        f_read(&file_handle, file_buf, (MSU_DAC_BUFSIZE / 2) - msu_audio_bytes_read, &msu_audio_bytes_read);
+      } else {
+        set_msu_status(0x00, 0x02); /* clear play bit */
        dac_pause();
      }
-
      msu_audio_bytes_read = MSU_DAC_BUFSIZE;
    }
  }
-
-    f_close( &file_handle );
-    DBG_MSU1 printf( "Reset " );
-
-    if ( msu_res == MSU_RESET_LONG )
-    {
-        f_close( &msufile );
-        DBG_MSU1 printf( "to menu\n" );
+  f_close(&file_handle);
+  DBG_MSU1 printf("Reset ");
+  if(msu_res == MSU_RESET_LONG) {
+    f_close(&msufile);
+    DBG_MSU1 printf("to menu\n");
    return 1;
  }
-
-    DBG_MSU1 printf( "game\n" );
+  DBG_MSU1 printf("game\n");
  return 0;
 }
 /* END OF MSU1 STUFF */
--- a/src/msu1.h
+++ b/src/msu1.h
@ -9,7 +9,7 @@

 #define MSU_DAC_BUFSIZE	(2048)

-int msu1_check( uint8_t * );
-int msu1_loop( void );
+int msu1_check(uint8_t*);
+int msu1_loop(void);

 #endif
--- a/src/openocd-usb.cfg
+++ b/src/openocd-usb.cfg
@ -4,11 +4,10 @@
 # http://www.hs-augsburg.de/~hhoegl/proj/usbjtag/usbjtag.html
 #

-#interface ft2232
-interface ftdi
-#ft2232_vid_pid 0x15ba 0x0003
-#ft2232_device_desc "Olimex OpenOCD JTAG"
-#ft2232_layout "olimex-jtag"
+interface ft2232
+ft2232_vid_pid 0x15ba 0x0003
+ft2232_device_desc "Olimex OpenOCD JTAG"
+ft2232_layout "olimex-jtag"


 #interface ft2232
--- a/src/power.c
+++ b/src/power.c
@ -15,12 +15,12 @@
   * USB [enabled via usb_init]
   * PWM1
 */
-void power_init()
-{
-    LPC_SC->PCONP = BV( PCSSP0 )
-                    | BV( PCTIM3 )
-                    | BV( PCRTC )
-                    | BV( PCGPIO )
-                    | BV( PCPWM1 )
-                    | BV( PCUSB );
+void power_init() {
+  LPC_SC->PCONP = BV(PCSSP0)
+                | BV(PCTIM3)
+                | BV(PCRTC)
+                | BV(PCGPIO)
+                | BV(PCPWM1)
+                | BV(PCUSB)
+  ;
 }
--- a/src/power.h
+++ b/src/power.h
@ -38,6 +38,6 @@
 #define PCQEI   (18)
 #define PCGPIO  (15)

-void power_init( void );
+void power_init(void);

 #endif
--- a/src/printf.c
+++ b/src/printf.c
@ -61,29 +61,24 @@ static char *outptr;
 static int maxlen;

 /* printf */
-static void outchar( char x )
-{
-    if ( maxlen )
-    {
+static void outchar(char x) {
+  if (maxlen) {
    maxlen--;
-        outfunc( x );
+    outfunc(x);
    outlength++;
  }
 }

 /* sprintf */
-static void outstr( char x )
-{
-    if ( maxlen )
-    {
+static void outstr(char x) {
+  if (maxlen) {
    maxlen--;
    *outptr++ = x;
    outlength++;
  }
 }

-static int internal_nprintf( void ( *output_function )( char c ), const char *fmt, va_list ap )
-{
+static int internal_nprintf(void (*output_function)(char c), const char *fmt, va_list ap) {
  unsigned int width;
  unsigned int flags;
  unsigned int base = 0;
@ -91,38 +86,27 @@ static int internal_nprintf( void ( *output_function )( char c ), const char *fm

  outlength = 0;

-    while ( *fmt )
-    {
-        while ( 1 )
-        {
-            if ( *fmt == 0 )
-            {
+  while (*fmt) {
+    while (1) {
+      if (*fmt == 0)
        goto end;
-            }

-            if ( *fmt == '%' )
-            {
+      if (*fmt == '%') {
        fmt++;
-
-                if ( *fmt != '%' )
-                {
+        if (*fmt != '%')
          break;
      }
-            }

-            output_function( *fmt++ );
+      output_function(*fmt++);
    }

    flags = 0;
    width = 0;

    /* read all flags */
-        do
-        {
-            if ( flags < FLAG_WIDTH )
-            {
-                switch ( *fmt )
-                {
+    do {
+      if (flags < FLAG_WIDTH) {
+        switch (*fmt) {
        case '0':
          flags |= FLAG_ZEROPAD;
          continue;
@ -141,44 +125,36 @@ static int internal_nprintf( void ( *output_function )( char c ), const char *fm
        }
      }

-            if ( flags < FLAG_LONG )
-            {
-                if ( *fmt >= '0' && *fmt <= '9' )
-                {
+      if (flags < FLAG_LONG) {
+        if (*fmt >= '0' && *fmt <= '9') {
          unsigned char tmp = *fmt - '0';
-                    width = 10 * width + tmp;
+          width = 10*width + tmp;
          flags |= FLAG_WIDTH;
          continue;
        }

-                if ( *fmt == 'h' )
-                {
+        if (*fmt == 'h')
          continue;
-                }

-                if ( *fmt == 'l' )
-                {
+        if (*fmt == 'l') {
          flags |= FLAG_LONG;
          continue;
        }
      }

      break;
-        }
-        while ( *fmt++ );
+    } while (*fmt++);

    /* Strings */
-        if ( *fmt == 'c' || *fmt == 's' )
-        {
-            switch ( *fmt )
-            {
+    if (*fmt == 'c' || *fmt == 's') {
+      switch (*fmt) {
      case 'c':
-                buffer[0] = va_arg( ap, int );
+        buffer[0] = va_arg(ap, int);
        ptr = buffer;
        break;

      case 's':
-                ptr = va_arg( ap, char * );
+        ptr = va_arg(ap, char *);
        break;
      }

@ -186,11 +162,9 @@ static int internal_nprintf( void ( *output_function )( char c ), const char *fm
    }

    /* Numbers */
-        switch ( *fmt )
-        {
+    switch (*fmt) {
    case 'u':
      flags |= FLAG_UNSIGNED;
-
    case 'd':
      base = 10;
      break;
@ -201,10 +175,9 @@ static int internal_nprintf( void ( *output_function )( char c ), const char *fm
      break;

    case 'p': // pointer
-            output_function( '0' );
-            output_function( 'x' );
+      output_function('0');
+      output_function('x');
      width -= 2;
-
    case 'x':
    case 'X':
      base = 16;
@ -214,90 +187,60 @@ static int internal_nprintf( void ( *output_function )( char c ), const char *fm

    unsigned int num;

-        if ( !( flags & FLAG_UNSIGNED ) )
-        {
-            int tmp = va_arg( ap, int );
-
-            if ( tmp < 0 )
-            {
+    if (!(flags & FLAG_UNSIGNED)) {
+      int tmp = va_arg(ap, int);
+      if (tmp < 0) {
        num = -tmp;
        flags |= FLAG_NEGATIVE;
-            }
-            else
-            {
+      } else
        num = tmp;
-            }
-        }
-        else
-        {
-            num = va_arg( ap, unsigned int );
+    } else {
+      num = va_arg(ap, unsigned int);
    }

    /* Convert number into buffer */
-        ptr = buffer + sizeof( buffer );
+    ptr = buffer + sizeof(buffer);
    *--ptr = 0;
-
-        do
-        {
+    do {
      *--ptr = hexdigits[num % base];
      num /= base;
-        }
-        while ( num != 0 );
+    } while (num != 0);

    /* Sign */
-        if ( flags & FLAG_NEGATIVE )
-        {
-            output_function( '-' );
+    if (flags & FLAG_NEGATIVE) {
+      output_function('-');
      width--;
-        }
-        else if ( flags & FLAG_FORCESIGN )
-        {
-            output_function( '+' );
+    } else if (flags & FLAG_FORCESIGN) {
+      output_function('+');
      width--;
-        }
-        else if ( flags & FLAG_BLANK )
-        {
-            output_function( ' ' );
+    } else if (flags & FLAG_BLANK) {
+      output_function(' ');
      width--;
    }

-output:
-
+  output:
    /* left padding */
-        if ( ( flags & FLAG_WIDTH ) && !( flags & FLAG_LEFTADJ ) )
-        {
-            while ( strlen( ptr ) < width )
-            {
-                if ( flags & FLAG_ZEROPAD )
-                {
-                    output_function( '0' );
-                }
+    if ((flags & FLAG_WIDTH) && !(flags & FLAG_LEFTADJ)) {
+      while (strlen(ptr) < width) {
+        if (flags & FLAG_ZEROPAD)
+          output_function('0');
        else
-                {
-                    output_function( ' ' );
-                }
-
+          output_function(' ');
        width--;
      }
    }

    /* data */
-        while ( *ptr )
-        {
-            output_function( *ptr++ );
-
-            if ( width )
-            {
+    while (*ptr) {
+      output_function(*ptr++);
+      if (width)
        width--;
    }
-        }

    /* right padding */
-        if ( flags & FLAG_WIDTH )
-        {
-            while ( width )
-            {
-                output_function( ' ' );
+    if (flags & FLAG_WIDTH) {
+      while (width) {
+        output_function(' ');
        width--;
      }
    }
@ -305,52 +248,44 @@ output:
    fmt++;
  }

-end:
+ end:
  return outlength;
 }

-int printf( const char *format, ... )
-{
+int printf(const char *format, ...) {
  va_list ap;
  int res;

  maxlen = -1;
-    va_start( ap, format );
-    res = internal_nprintf( outchar, format, ap );
-    va_end( ap );
+  va_start(ap, format);
+  res = internal_nprintf(outchar, format, ap);
+  va_end(ap);
  return res;
 }

-int snprintf( char *str, size_t size, const char *format, ... )
-{
+int snprintf(char *str, size_t size, const char *format, ...) {
  va_list ap;
  int res;

  maxlen = size;
  outptr = str;
-    va_start( ap, format );
-    res = internal_nprintf( outstr, format, ap );
-    va_end( ap );
-
-    if ( res < size )
-    {
+  va_start(ap, format);
+  res = internal_nprintf(outstr, format, ap);
+  va_end(ap);
+  if (res < size)
    str[res] = 0;
-    }
-
  return res;
 }

 /* Required for gcc compatibility */
-int puts( const char *str )
-{
-    uart_puts( str );
-    uart_putc( '\n' );
+int puts(const char *str) {
+  uart_puts(str);
+  uart_putc('\n');
  return 0;
 }

 #undef putchar
-int putchar( int c )
-{
-    uart_putc( c );
+int putchar(int c) {
+  uart_putc(c);
  return 0;
 }
--- a/src/rle.c
+++ b/src/rle.c
@ -2,92 +2,65 @@
 #include "rle.h"
 #include "fileops.h"

-uint8_t rle_file_getc()
-{
+uint8_t rle_file_getc() {
  static uint16_t rle_filled = 0;
  static uint8_t data;
-
-    if ( !rle_filled )
-    {
+  if(!rle_filled) {
    data = file_getc();
-
-        switch ( data )
-        {
+    switch(data) {
      case RLE_RUN:
        data = file_getc();
-            rle_filled = file_getc() - 1;
+        rle_filled = file_getc()-1;
        break;
-
      case RLE_RUNLONG:
        data = file_getc();
        rle_filled = file_getc();
        rle_filled |= file_getc() << 8;
        rle_filled--;
        break;
-
      case RLE_ESC:
        data = file_getc();
        break;
    }
-    }
-    else
-    {
+  } else {
    rle_filled--;
  }
-
-    if ( file_status || file_res )
-    {
-        rle_filled = 0;
-    }
-
+  if(file_status || file_res) rle_filled = 0;
  return data;
 }

-void rle_mem_init( const uint8_t *address, uint32_t len )
-{
+void rle_mem_init(const uint8_t* address, uint32_t len) {
  rle_mem_ptr = address;
-    rle_mem_endptr = address + len;
+  rle_mem_endptr = address+len;
  rle_state = 0;
 }

-uint8_t rle_mem_getc()
-{
+uint8_t rle_mem_getc() {
  static uint16_t rle_mem_filled = 0;
  static uint8_t rle_mem_data;
-
-    if ( !rle_mem_filled )
-    {
-        rle_mem_data = *( rle_mem_ptr++ );
-
-        switch ( rle_mem_data )
-        {
+  if(!rle_mem_filled) {
+    rle_mem_data = *(rle_mem_ptr++);
+    switch(rle_mem_data) {
      case RLE_RUN:
-            rle_mem_data = *( rle_mem_ptr )++;
-            rle_mem_filled = *( rle_mem_ptr )++ - 1;
+        rle_mem_data = *(rle_mem_ptr)++;
+        rle_mem_filled = *(rle_mem_ptr)++ - 1;
        break;
-
      case RLE_RUNLONG:
-            rle_mem_data = *( rle_mem_ptr )++;
-            rle_mem_filled = *( rle_mem_ptr )++;
-            rle_mem_filled |= *( rle_mem_ptr )++ << 8;
+        rle_mem_data = *(rle_mem_ptr)++;
+        rle_mem_filled = *(rle_mem_ptr)++;
+        rle_mem_filled |= *(rle_mem_ptr)++ << 8;
        rle_mem_filled--;
        break;
-
      case RLE_ESC:
-            rle_mem_data = *( rle_mem_ptr )++;
+        rle_mem_data = *(rle_mem_ptr)++;
        break;
    }
-    }
-    else
-    {
+  } else {
    rle_mem_filled--;
  }
-
-    if ( rle_mem_ptr >= rle_mem_endptr )
-    {
+  if(rle_mem_ptr>=rle_mem_endptr){
    rle_mem_filled = 0;
    rle_state = 1;
  }
-
  return rle_mem_data;
 }
--- a/src/rle.h
+++ b/src/rle.h
@ -7,9 +7,9 @@
 #define RLE_RUN     (0x5b)
 #define RLE_RUNLONG (0x77)

-uint8_t rle_file_getc( void );
-uint8_t rle_mem_getc( void );
-void rle_mem_init( const uint8_t *address, uint32_t len );
+uint8_t rle_file_getc(void);
+uint8_t rle_mem_getc(void);
+void rle_mem_init(const uint8_t *address, uint32_t len);
 const uint8_t *rle_mem_ptr;
 const uint8_t *rle_mem_endptr;
 uint8_t rle_state;
--- a/src/rtc.c
+++ b/src/rtc.c
@ -11,32 +11,23 @@ rtcstate_t rtc_state;
 #define CLKEN  0
 #define CTCRST 1

-uint8_t rtc_isvalid( void )
-{
-    if ( LPC_RTC->GPREG0 == RTC_MAGIC )
-    {
+uint8_t rtc_isvalid(void) {
+  if(LPC_RTC->GPREG0 == RTC_MAGIC) {
    return RTC_OK;
  }
-
  return RTC_INVALID;
 }

-void rtc_init( void )
-{
-    if ( LPC_RTC->CCR & BV( CLKEN ) )
-    {
+void rtc_init(void) {
+  if (LPC_RTC->CCR & BV(CLKEN)) {
    rtc_state = RTC_OK;
-    }
-    else
-    {
+  } else {
    rtc_state = RTC_INVALID;
  }
 }

-void read_rtc( struct tm *time )
-{
-    do
-    {
+void read_rtc(struct tm *time) {
+  do {
    time->tm_sec  = LPC_RTC->SEC;
    time->tm_min  = LPC_RTC->MIN;
    time->tm_hour = LPC_RTC->HOUR;
@ -44,116 +35,101 @@ void read_rtc( struct tm *time )
    time->tm_mon  = LPC_RTC->MONTH;
    time->tm_year = LPC_RTC->YEAR;
    time->tm_wday = LPC_RTC->DOW;
-    }
-    while ( time->tm_sec != LPC_RTC->SEC );
+  } while (time->tm_sec != LPC_RTC->SEC);
 }

-uint8_t calc_weekday( struct tm *time )
-{
+uint8_t calc_weekday(struct tm *time) {
  int month = time->tm_mon;
  int year = time->tm_year;
  int day = time->tm_mday;

  /* Variation of Sillke for the Gregorian calendar.
   * http://www.mathematik.uni-bielefeld.de/~sillke/ALGORITHMS/calendar/weekday.c */
-    if ( month <= 2 )
-    {
+  if (month <= 2) {
     month += 10;
     year--;
-    }
-    else
-    {
-        month -= 2;
-    }
-
-    return ( 83 * month / 32 + day + year + year / 4 - year / 100 + year / 400 ) % 7;
+  } else month -= 2;
+  return (83*month/32 + day + year + year/4 - year/100 + year/400) % 7;
 }

-void set_rtc( struct tm *time )
-{
-    LPC_RTC->CCR   = BV( CTCRST );
+void set_rtc(struct tm *time) {
+  LPC_RTC->CCR   = BV(CTCRST);
  LPC_RTC->SEC   = time->tm_sec;
  LPC_RTC->MIN   = time->tm_min;
  LPC_RTC->HOUR  = time->tm_hour;
  LPC_RTC->DOM   = time->tm_mday;
  LPC_RTC->MONTH = time->tm_mon;
  LPC_RTC->YEAR  = time->tm_year;
-    LPC_RTC->DOW   = calc_weekday( time );
-    LPC_RTC->CCR   = BV( CLKEN );
+  LPC_RTC->DOW   = calc_weekday(time);
+  LPC_RTC->CCR   = BV(CLKEN);
  LPC_RTC->GPREG0 = RTC_MAGIC;
 }

-void invalidate_rtc()
-{
+void invalidate_rtc() {
  LPC_RTC->GPREG0 = 0;
 }

-uint32_t get_fattime( void )
-{
+uint32_t get_fattime(void) {
  struct tm time;

-    read_rtc( &time );
-    return ( ( uint32_t )time.tm_year - 1980 ) << 25 |
-           ( ( uint32_t )time.tm_mon ) << 21 |
-           ( ( uint32_t )time.tm_mday )  << 16 |
-           ( ( uint32_t )time.tm_hour )  << 11 |
-           ( ( uint32_t )time.tm_min )   << 5  |
-           ( ( uint32_t )time.tm_sec )   >> 1;
+  read_rtc(&time);
+  return ((uint32_t)time.tm_year-1980) << 25 |
+    ((uint32_t)time.tm_mon) << 21 |
+    ((uint32_t)time.tm_mday)  << 16 |
+    ((uint32_t)time.tm_hour)  << 11 |
+    ((uint32_t)time.tm_min)   << 5  |
+    ((uint32_t)time.tm_sec)   >> 1;
 }

-uint64_t get_bcdtime( void )
-{
+uint64_t get_bcdtime(void) {
  struct tm time;
-    read_rtc( &time );
+  read_rtc(&time);
  uint16_t year = time.tm_year;

-    return ( ( uint64_t )( time.tm_wday % 7 ) << 56 )
-           | ( ( uint64_t )( ( year / 1000 ) % 10 ) << 52 )
-           | ( ( uint64_t )( ( year / 100 ) % 10 ) << 48 )
-           | ( ( uint64_t )( ( year / 10 ) % 10 ) << 44 )
-           | ( ( uint64_t )( year % 10 ) << 40 )
-           | ( ( uint64_t )( time.tm_mon / 10 ) << 36 )
-           | ( ( uint64_t )( time.tm_mon % 10 ) << 32 )
-           | ( ( time.tm_mday / 10 ) << 28 )
-           | ( ( time.tm_mday % 10 ) << 24 )
-           | ( ( time.tm_hour / 10 ) << 20 )
-           | ( ( time.tm_hour % 10 ) << 16 )
-           | ( ( time.tm_min / 10 ) << 12 )
-           | ( ( time.tm_min % 10 ) << 8 )
-           | ( ( time.tm_sec / 10 ) << 4 )
-           | ( time.tm_sec % 10 );
+  return ((uint64_t)(time.tm_wday % 7) << 56)
+         |((uint64_t)((year / 1000) % 10) << 52)
+         |((uint64_t)((year / 100) % 10) << 48)
+         |((uint64_t)((year / 10) % 10) << 44)
+         |((uint64_t)(year % 10) << 40)
+         |((uint64_t)(time.tm_mon / 10) << 36)
+         |((uint64_t)(time.tm_mon % 10) << 32)
+         |((time.tm_mday / 10) << 28)
+         |((time.tm_mday % 10) << 24)
+         |((time.tm_hour / 10) << 20)
+         |((time.tm_hour % 10) << 16)
+         |((time.tm_min / 10) << 12)
+         |((time.tm_min % 10) << 8)
+         |((time.tm_sec / 10) << 4)
+         |(time.tm_sec % 10);
 }

-void set_bcdtime( uint64_t btime )
-{
+void set_bcdtime(uint64_t btime) {
  struct tm time;
-    time.tm_sec = ( btime & 0xf ) + ( ( btime >> 4 ) & 0xf ) * 10;
-    time.tm_min = ( ( btime >> 8 ) & 0xf ) + ( ( btime >> 12 ) & 0xf ) * 10;
-    time.tm_hour = ( ( btime >> 16 ) & 0xf ) + ( ( btime >> 20 ) & 0xf ) * 10;
-    time.tm_mday = ( ( btime >> 24 ) & 0xf ) + ( ( btime >> 28 ) & 0xf ) * 10;
-    time.tm_mon = ( ( btime >> 32 ) & 0xf ) + ( ( btime >> 36 ) & 0xf ) * 10;
-    time.tm_year = ( ( btime >> 40 ) & 0xf ) + ( ( btime >> 44 ) & 0xf ) * 10
-                   + ( ( btime >> 48 ) & 0xf ) * 100 + ( ( btime >> 52 ) & 0xf ) * 1000;
-    printtime( &time );
-    set_rtc( &time );
+  time.tm_sec = (btime & 0xf) + ((btime >> 4) & 0xf) * 10;
+  time.tm_min = ((btime >> 8) & 0xf) + ((btime >> 12) & 0xf) * 10;
+  time.tm_hour = ((btime >> 16) & 0xf) + ((btime >> 20) & 0xf) * 10;
+  time.tm_mday = ((btime >> 24) & 0xf) + ((btime >> 28) & 0xf) * 10;
+  time.tm_mon = ((btime >> 32) & 0xf) + ((btime >> 36) & 0xf) * 10;
+  time.tm_year = ((btime >> 40) & 0xf) + ((btime >> 44) & 0xf) * 10
+               + ((btime >> 48) & 0xf) * 100 + ((btime >> 52) & 0xf) * 1000;
+  printtime(&time);
+  set_rtc(&time);
 }

-void printtime( struct tm *time )
-{
-    printf( "%04d-%02d-%02d %02d:%02d:%02d\n", time->tm_year, time->tm_mon,
-            time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec );
+void printtime(struct tm *time) {
+  printf("%04d-%02d-%02d %02d:%02d:%02d\n", time->tm_year, time->tm_mon,
+    time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec);
 }

-void testbattery()
-{
-    printf( "%lx\n", LPC_RTC->GPREG0 );
+void testbattery() {
+  printf("%lx\n", LPC_RTC->GPREG0);
  LPC_RTC->GPREG0 = RTC_MAGIC;
-    printf( "%lx\n", LPC_RTC->GPREG0 );
+  printf("%lx\n", LPC_RTC->GPREG0);
  LPC_RTC->CCR = 0;
-    BITBAND( LPC_SC->PCONP, PCRTC ) = 0;
-    delay_ms( 20000 );
-    BITBAND( LPC_SC->PCONP, PCRTC ) = 1;
-    printf( "%lx\n", LPC_RTC->GPREG0 );
-    delay_ms( 20 );
-    LPC_RTC->CCR = BV( CLKEN );
+  BITBAND(LPC_SC->PCONP, PCRTC) = 0;
+  delay_ms(20000);
+  BITBAND(LPC_SC->PCONP, PCRTC) = 1;
+  printf("%lx\n", LPC_RTC->GPREG0);
+  delay_ms(20);
+  LPC_RTC->CCR = BV(CLKEN);
 }
--- a/src/rtc.h
+++ b/src/rtc.h
@ -29,15 +29,13 @@

 #include <stdint.h>

-typedef enum
-{
+typedef enum {
  RTC_NOT_FOUND,  /* No RTC present                    */
  RTC_INVALID,    /* RTC present, but contents invalid */
  RTC_OK          /* RTC present and working           */
 } rtcstate_t;

-struct tm
-{
+struct tm {
  uint8_t tm_sec;  // 0..59
  uint8_t tm_min;  // 0..59
  uint8_t tm_hour; // 0..23
@ -52,29 +50,29 @@ struct tm

 extern rtcstate_t rtc_state;

-void rtc_init( void );
+void rtc_init(void);

 /* return RTC valid state based on magic token in backup register */
-uint8_t rtc_isvalid( void );
+uint8_t rtc_isvalid(void);

 /* Return current time in struct tm */
-void read_rtc( struct tm *time );
+void read_rtc(struct tm *time);

 /* Set time from struct tm, also sets RTC valid */
-void set_rtc( struct tm *time );
+void set_rtc(struct tm *time);

 /* Set RTC invalid */
-void invalidate_rtc( void );
+void invalidate_rtc(void);

 /* get current time in 60-bit BCD format (WYYYYMMDDHHMMSS) (W=DOW) */
-uint64_t get_bcdtime( void );
+uint64_t get_bcdtime(void);

 /* set current time from 56-bit BCD format (YYYYMMDDHHMMSS)
   DOW is calculated */
-void set_bcdtime( uint64_t btime );
+void set_bcdtime(uint64_t btime);

 /* print the time to the console */
-void printtime( struct tm *time );
+void printtime(struct tm *time);

-void testbattery( void );
+void testbattery(void);
 #endif
--- a/src/sdnative.c
+++ b/src/sdnative.c
--- a/src/sdnative.h
+++ b/src/sdnative.h
@ -16,16 +16,16 @@
 extern int sd_offload;

 /* These functions are weak-aliased to disk_... */
-void    sdn_init( void );
-DSTATUS sdn_status( BYTE drv );
-DSTATUS sdn_initialize( BYTE drv );
-DRESULT sdn_read( BYTE drv, BYTE *buffer, DWORD sector, BYTE count );
-DRESULT sdn_write( BYTE drv, const BYTE *buffer, DWORD sector, BYTE count );
-DRESULT sdn_getinfo( BYTE drv, BYTE page, void *buffer );
-DRESULT sdn_ioctl( BYTE drv, BYTE cmd, void *buffer );
+void    sdn_init(void);
+DSTATUS sdn_status(BYTE drv);
+DSTATUS sdn_initialize(BYTE drv);
+DRESULT sdn_read(BYTE drv, BYTE *buffer, DWORD sector, BYTE count);
+DRESULT sdn_write(BYTE drv, const BYTE *buffer, DWORD sector, BYTE count);
+DRESULT sdn_getinfo(BYTE drv, BYTE page, void *buffer);
+DRESULT sdn_ioctl(BYTE drv, BYTE cmd, void *buffer);

-void    sdn_changed( void );
-uint8_t *sdn_getcid( void );
-void    sdn_gettacc( uint32_t *tacc_max, uint32_t *tacc_avg );
+void    sdn_changed(void);
+uint8_t* sdn_getcid(void);
+void    sdn_gettacc(uint32_t *tacc_max, uint32_t *tacc_avg);
 #endif

--- a/src/smc.c
+++ b/src/smc.c
@ -35,165 +35,128 @@ snes_romprops_t romprops;

 uint32_t hdr_addr[6] = {0xffb0, 0x101b0, 0x7fb0, 0x81b0, 0x40ffb0, 0x4101b0};

-uint8_t isFixed( uint8_t *data, int size, uint8_t value )
-{
+uint8_t isFixed(uint8_t* data, int size, uint8_t value) {
  uint8_t res = 1;
-
-    do
-    {
+  do {
    size--;
-
-        if ( data[size] != value )
-        {
+    if(data[size] != value) {
      res = 0;
    }
-    }
-    while ( size );
-
+  } while (size);
  return res;
 }

-uint8_t checkChksum( uint16_t cchk, uint16_t chk )
-{
+uint8_t checkChksum(uint16_t cchk, uint16_t chk) {
  uint32_t sum = cchk + chk;
  uint8_t res = 0;
-
-    if ( sum == 0x0000ffff )
-    {
+  if(sum==0x0000ffff) {
    res = 1;
  }
-
  return res;
 }

-void smc_id( snes_romprops_t *props )
-{
-    uint8_t score, maxscore = 1, score_idx = 2; /* assume LoROM */
-    snes_header_t *header = &( props->header );
+void smc_id(snes_romprops_t* props) {
+  uint8_t score, maxscore=1, score_idx=2; /* assume LoROM */
+  snes_header_t* header = &(props->header);

+  props->load_address = 0;
  props->has_dspx = 0;
  props->has_st0010 = 0;
  props->has_cx4 = 0;
  props->fpga_features = 0;
  props->fpga_conf = NULL;
-
-    for ( uint8_t num = 0; num < 6; num++ )
-    {
-        score = smc_headerscore( hdr_addr[num], header );
-        printf( "%d: offset = %lX; score = %d\n", num, hdr_addr[num], score ); // */
-
-        if ( score >= maxscore )
-        {
-            score_idx = num;
-            maxscore = score;
+  for(uint8_t num = 0; num < 6; num++) {
+    score = smc_headerscore(hdr_addr[num], header);
+    printf("%d: offset = %lX; score = %d\n", num, hdr_addr[num], score); // */
+    if(score>=maxscore) {
+      score_idx=num;
+      maxscore=score;
    }
  }
-
-    if ( score_idx & 1 )
-    {
+  if(score_idx & 1) {
    props->offset = 0x200;
-    }
-    else
-    {
+  } else {
    props->offset = 0;
  }

  /* restore the chosen one */
-    /*dprintf("winner is %d\n", score_idx); */
-    file_readblock( header, hdr_addr[score_idx], sizeof( snes_header_t ) );
+/*dprintf("winner is %d\n", score_idx); */
+  file_readblock(header, hdr_addr[score_idx], sizeof(snes_header_t));

-    if ( header->name[0x13] == 0x00 || header->name[0x13] == 0xff )
-    {
-        if ( header->name[0x14] == 0x00 )
-        {
+  if(header->name[0x13] == 0x00 || header->name[0x13] == 0xff) {
+    if(header->name[0x14] == 0x00) {
      const uint8_t n15 = header->map;
-
-            if ( n15 == 0x00 || n15 == 0x80 || n15 == 0x84 || n15 == 0x9c
-                    || n15 == 0xbc || n15 == 0xfc )
-            {
-                if ( header->licensee == 0x33 || header->licensee == 0xff )
-                {
+      if(n15 == 0x00 || n15 == 0x80 || n15 == 0x84 || n15 == 0x9c
+        || n15 == 0xbc || n15 == 0xfc) {
+        if(header->licensee == 0x33 || header->licensee == 0xff) {
          props->mapper_id = 0;
-                    /*XXX do this properly */
+/*XXX do this properly */
          props->ramsize_bytes = 0x8000;
          props->romsize_bytes = 0x100000;
          props->expramsize_bytes = 0;
          props->mapper_id = 3; /* BS-X Memory Map */
          props->region = 0; /* BS-X only existed in Japan */
+          uint8_t alloc = header->name[0x10];
+          if(alloc) {
+            while(!(alloc & 0x01)) {
+              props->load_address += 0x20000;
+              alloc >>= 1;
+            }
+          }
+          printf("load address: %lx\n", props->load_address);
          return;
        }
      }
    }
  }
-
-    switch ( header->map & 0xef )
-    {
+  switch(header->map & 0xef) {

    case 0x21: /* HiROM */
      props->mapper_id = 0;
-
-        if ( header->map == 0x31 && ( header->carttype == 0x03 || header->carttype == 0x05 ) )
-        {
+      if(header->map == 0x31 && (header->carttype == 0x03 || header->carttype == 0x05)) {
        props->has_dspx = 1;
        props->dsp_fw = DSPFW_1B;
        props->fpga_features |= FEAT_DSPX;
      }
-
      break;

    case 0x20: /* LoROM */
      props->mapper_id = 1;
-
-        if ( header->map == 0x20 && header->carttype == 0xf3 )
-        {
+      if (header->map == 0x20 && header->carttype == 0xf3) {
        props->has_cx4 = 1;
        props->dsp_fw = CX4FW;
        props->fpga_conf = FPGA_CX4;
        props->fpga_features |= FEAT_CX4;
      }
-        else if ( ( header->map == 0x20 && header->carttype == 0x03 ) ||
-                  ( header->map == 0x30 && header->carttype == 0x05 && header->licensee != 0xb2 ) )
-        {
+      else if ((header->map == 0x20 && header->carttype == 0x03) ||
+          (header->map == 0x30 && header->carttype == 0x05 && header->licensee != 0xb2)) {
        props->has_dspx = 1;
        props->fpga_features |= FEAT_DSPX;
-
        /* Pilotwings uses DSP1 instead of DSP1B */
-            if ( !memcmp( header->name, "PILOTWINGS", 10 ) )
-            {
+        if(!memcmp(header->name, "PILOTWINGS", 10)) {
          props->dsp_fw = DSPFW_1;
-            }
-            else
-            {
+        } else {
          props->dsp_fw = DSPFW_1B;
        }
-        }
-        else if ( header->map == 0x20 && header->carttype == 0x05 )
-        {
+      } else if (header->map == 0x20 && header->carttype == 0x05) {
        props->has_dspx = 1;
        props->dsp_fw = DSPFW_2;
        props->fpga_features |= FEAT_DSPX;
-        }
-        else if ( header->map == 0x30 && header->carttype == 0x05 && header->licensee == 0xb2 )
-        {
+      } else if (header->map == 0x30 && header->carttype == 0x05 && header->licensee == 0xb2) {
        props->has_dspx = 1;
        props->dsp_fw = DSPFW_3;
        props->fpga_features |= FEAT_DSPX;
-        }
-        else if ( header->map == 0x30 && header->carttype == 0x03 )
-        {
+      } else if (header->map == 0x30 && header->carttype == 0x03) {
        props->has_dspx = 1;
        props->dsp_fw = DSPFW_4;
        props->fpga_features |= FEAT_DSPX;
-        }
-        else if ( header->map == 0x30 && header->carttype == 0xf6 && header->romsize >= 0xa )
-        {
+      } else if (header->map == 0x30 && header->carttype == 0xf6 && header->romsize >= 0xa) {
        props->has_dspx = 1;
        props->has_st0010 = 1;
        props->dsp_fw = DSPFW_ST0010;
        props->fpga_features |= FEAT_ST0010;
        header->ramsize = 2;
      }
-
      break;

    case 0x25: /* ExHiROM */
@ -201,159 +164,91 @@ void smc_id( snes_romprops_t *props )
      break;

    case 0x22: /* ExLoROM */
-        if ( file_handle.fsize > 0x400200 )
-        {
+      if(file_handle.fsize > 0x400200) {
        props->mapper_id = 6; /* SO96 */
-        }
-        else
-        {
+      } else {
        props->mapper_id = 1;
      }
-
      break;

    default: /* invalid/unsupported mapper, use header location */
-        switch ( score_idx )
-        {
+      switch(score_idx) {
        case 0:
        case 1:
          props->mapper_id = 0;
          break;
-
        case 2:
        case 3:
-            if ( file_handle.fsize > 0x800200 )
-            {
+          if(file_handle.fsize > 0x800200) {
            props->mapper_id = 6; /* SO96 interleaved */
-            }
-            else if ( file_handle.fsize > 0x400200 )
-            {
+          } else if(file_handle.fsize > 0x400200) {
            props->mapper_id = 1; /* ExLoROM */
-            }
-            else
-            {
+          } else {
            props->mapper_id = 1; /* LoROM */
          }
-
          break;
-
        case 4:
        case 5:
          props->mapper_id = 2;
          break;
-
        default:
          props->mapper_id = 1; // whatever
      }
  }
-
-    if ( header->romsize == 0 || header->romsize > 13 )
-    {
+  if(header->romsize == 0 || header->romsize > 13) {
    props->romsize_bytes = 1024;
    header->romsize = 0;
-
-        if ( file_handle.fsize >= 1024 )
-        {
-            while ( props->romsize_bytes < file_handle.fsize - 1 )
-            {
+    if(file_handle.fsize >= 1024) {
+      while(props->romsize_bytes < file_handle.fsize-1) {
        header->romsize++;
        props->romsize_bytes <<= 1;
      }
    }
  }
-
-    props->ramsize_bytes = ( uint32_t )1024 << header->ramsize;
-    props->romsize_bytes = ( uint32_t )1024 << header->romsize;
-    props->expramsize_bytes = ( uint32_t )1024 << header->expramsize;
-
+  props->ramsize_bytes = (uint32_t)1024 << header->ramsize;
+  props->romsize_bytes = (uint32_t)1024 << header->romsize;
+  props->expramsize_bytes = (uint32_t)1024 << header->expramsize;
  //dprintf("ramsize_bytes: %ld\n", props->ramsize_bytes); 
-    if ( props->ramsize_bytes > 32768 || props->ramsize_bytes < 2048 )
-    {
+  if(props->ramsize_bytes > 32768 || props->ramsize_bytes < 2048) {
    props->ramsize_bytes = 0;
  }
+  props->region = (header->destcode <= 1 || header->destcode >= 13) ? 0 : 1;

-    props->region = ( header->destcode <= 1 || header->destcode >= 13 ) ? 0 : 1;
-
-    /*dprintf("ramsize_bytes: %ld\n", props->ramsize_bytes); */
+/*dprintf("ramsize_bytes: %ld\n", props->ramsize_bytes); */
 }

-uint8_t smc_headerscore( uint32_t addr, snes_header_t *header )
-{
-    int score = 0;
+uint8_t smc_headerscore(uint32_t addr, snes_header_t* header) {
+  int score=0;
  uint8_t reset_inst;
  uint16_t header_offset;
-
-    if ( ( addr & 0xfff ) == 0x1b0 )
-    {
+  if((addr & 0xfff) == 0x1b0) {
    header_offset = 0x200;
-    }
-    else
-    {
+  } else {
    header_offset = 0;
  }
-
-    if ( ( file_readblock( header, addr, sizeof( snes_header_t ) ) < sizeof( snes_header_t ) )
-            || file_res )
-    {
+  if((file_readblock(header, addr, sizeof(snes_header_t)) < sizeof(snes_header_t))
+     || file_res) {
    return 0;
  }
-
  uint8_t mapper = header->map & ~0x10;
  uint16_t resetvector = header->vect_reset; /* not endian safe! */
-    uint32_t file_addr = ( ( ( addr - header_offset ) & ~0x7fff ) | ( resetvector & 0x7fff ) ) + header_offset;
+  uint32_t file_addr = (((addr - header_offset) & ~0x7fff) | (resetvector & 0x7fff)) + header_offset;
+  if(resetvector < 0x8000) return 0;

-    if ( resetvector < 0x8000 )
-    {
-        return 0;
-    }
+  score += 2*isFixed(&header->licensee, sizeof(header->licensee), 0x33);
+  score += 4*checkChksum(header->cchk, header->chk);
+  if(header->carttype < 0x08) score++;
+  if(header->romsize < 0x10) score++;
+  if(header->ramsize < 0x08) score++;
+  if(header->destcode < 0x0e) score++;

-    score += 2 * isFixed( &header->licensee, sizeof( header->licensee ), 0x33 );
-    score += 4 * checkChksum( header->cchk, header->chk );
+  if((addr-header_offset) == 0x007fc0 && mapper == 0x20) score += 2;
+  if((addr-header_offset) == 0x00ffc0 && mapper == 0x21) score += 2;
+  if((addr-header_offset) == 0x007fc0 && mapper == 0x22) score += 2;
+  if((addr-header_offset) == 0x40ffc0 && mapper == 0x25) score += 2;

-    if ( header->carttype < 0x08 )
-    {
-        score++;
-    }
-
-    if ( header->romsize < 0x10 )
-    {
-        score++;
-    }
-
-    if ( header->ramsize < 0x08 )
-    {
-        score++;
-    }
-
-    if ( header->destcode < 0x0e )
-    {
-        score++;
-    }
-
-    if ( ( addr - header_offset ) == 0x007fc0 && mapper == 0x20 )
-    {
-        score += 2;
-    }
-
-    if ( ( addr - header_offset ) == 0x00ffc0 && mapper == 0x21 )
-    {
-        score += 2;
-    }
-
-    if ( ( addr - header_offset ) == 0x007fc0 && mapper == 0x22 )
-    {
-        score += 2;
-    }
-
-    if ( ( addr - header_offset ) == 0x40ffc0 && mapper == 0x25 )
-    {
-        score += 2;
-    }
-
-    file_readblock( &reset_inst, file_addr, 1 );
-
-    switch ( reset_inst )
-    {
+  file_readblock(&reset_inst, file_addr, 1);
+  switch(reset_inst) {
    case 0x78: /* sei */
    case 0x18: /* clc */
    case 0x38: /* sec */
@ -395,16 +290,8 @@ uint8_t smc_headerscore( uint32_t addr, snes_header_t *header )
      break;
  }

-    if ( score && addr > 0x400000 )
-    {
-        score += 4;
-    }
-
-    if ( score < 0 )
-    {
-        score = 0;
-    }
-
+  if(score && addr > 0x400000) score += 4;
+  if(score < 0) score = 0;
  return score;
 }

--- a/src/smc.h
+++ b/src/smc.h
@ -37,8 +37,7 @@

 #define FPGA_CX4 ((const uint8_t*)"/sd2snes/fpga_cx4.bit")

-typedef struct _snes_header
-{
+typedef struct _snes_header {
  uint8_t maker[2];     /* 0xB0 */
  uint8_t gamecode[4];  /* 0xB2 */
  uint8_t fixed_00[7];	/* 0xB6 */
@ -70,26 +69,26 @@ typedef struct _snes_header
  uint16_t vect_brk8;   /* 0xFE */
 } snes_header_t;

-typedef struct _snes_romprops
-{
+typedef struct _snes_romprops {
  uint16_t offset;            /* start of actual ROM image */
  uint8_t mapper_id;          /* FPGA mapper */
  uint8_t pad1;               /* for alignment */
  uint32_t expramsize_bytes;  /* ExpRAM size in bytes */
  uint32_t ramsize_bytes;     /* CartRAM size in bytes */
  uint32_t romsize_bytes;     /* ROM size in bytes (rounded up) */
-    const uint8_t *dsp_fw;      /* DSP (NEC / Hitachi) ROM filename */
-    const uint8_t *fpga_conf;   /* FPGA config file to load (default: base) */
+  const uint8_t* dsp_fw;      /* DSP (NEC / Hitachi) ROM filename */
+  const uint8_t* fpga_conf;   /* FPGA config file to load (default: base) */
  uint8_t has_dspx;           /* DSP[1-4] presence flag */
  uint8_t has_st0010;         /* st0010 presence flag (additional to dspx) */
  uint8_t has_msu1;           /* MSU1 presence flag */
  uint8_t has_cx4;            /* CX4 presence flag */
  uint8_t fpga_features;      /* feature/peripheral enable bits*/
  uint8_t region;             /* game region (derived from destination code) */
+  uint32_t load_address;      /* where to load the ROM image */
  snes_header_t header;       /* original header from ROM image */
 } snes_romprops_t;

-void smc_id( snes_romprops_t * );
-uint8_t smc_headerscore( uint32_t addr, snes_header_t *header );
+void smc_id(snes_romprops_t*);
+uint8_t smc_headerscore(uint32_t addr, snes_header_t* header);

 #endif
--- a/src/snes.c
+++ b/src/snes.c
@ -25,7 +25,6 @@
 */

 #include <arm/NXP/LPC17xx/LPC17xx.h>
-#include <string.h>
 #include "bits.h"
 #include "config.h"
 #include "uart.h"
@ -40,51 +39,42 @@
 #include "fpga.h"
 #include "fpga_spi.h"

-uint8_t initloop = 1;
+uint8_t initloop=1;
 uint32_t saveram_crc, saveram_crc_old;
 extern snes_romprops_t romprops;

 volatile int reset_changed;
 volatile int reset_pressed;

-void prepare_reset()
-{
-    snes_reset( 1 );
-    delay_ms( SNES_RESET_PULSELEN_MS );
-
-    if ( romprops.ramsize_bytes && fpga_test() == FPGA_TEST_TOKEN )
-    {
-        writeled( 1 );
-        save_sram( file_lfn, romprops.ramsize_bytes, SRAM_SAVE_ADDR );
-        writeled( 0 );
+void prepare_reset() {
+  snes_reset(1);
+  delay_ms(SNES_RESET_PULSELEN_MS);
+  if(romprops.ramsize_bytes && fpga_test() == FPGA_TEST_TOKEN) {
+    writeled(1);
+    save_sram(file_lfn, romprops.ramsize_bytes, SRAM_SAVE_ADDR);
+    writeled(0);
  }
-
-    rdyled( 1 );
-    readled( 1 );
-    writeled( 1 );
-    snes_reset( 0 );
-
-    while ( get_snes_reset() );
-
-    snes_reset( 1 );
-    fpga_dspx_reset( 1 );
-    delay_ms( 200 );
+  rdyled(1);
+  readled(1);
+  writeled(1);
+  snes_reset(0);
+  while(get_snes_reset());
+  snes_reset(1);
+  fpga_dspx_reset(1);
+  delay_ms(200);
 }

-void snes_init()
-{
+void snes_init() {
  /* put reset level on reset pin */
-    BITBAND( SNES_RESET_REG->FIOCLR, SNES_RESET_BIT ) = 1;
-
+  BITBAND(SNES_RESET_REG->FIOCLR, SNES_RESET_BIT) = 1;
  /* reset the SNES */
-    snes_reset( 1 );
+  snes_reset(1);
 }

-void snes_reset_pulse()
-{
-    snes_reset( 1 );
-    delay_ms( SNES_RESET_PULSELEN_MS );
-    snes_reset( 0 );
+void snes_reset_pulse() {
+  snes_reset(1);
+  delay_ms(SNES_RESET_PULSELEN_MS);
+  snes_reset(0);
 }

 /*
@ -92,9 +82,12 @@ void snes_reset_pulse()
 *
 *  state: put SNES in reset state when 1, release when 0
 */
-void snes_reset( int state )
-{
-    BITBAND( SNES_RESET_REG->FIODIR, SNES_RESET_BIT ) = state;
+void snes_reset(int state) {
+  if (state == 0)
+    printf("Releasing SNES RESET\n");
+  else
+    printf("Pull SNES RESET\n");
+  BITBAND(SNES_RESET_REG->FIODIR, SNES_RESET_BIT) = state;
 }

 /*
@ -102,9 +95,8 @@ void snes_reset( int state )
 *
 * returns: 1 when reset, 0 when not reset
 */
-uint8_t get_snes_reset()
-{
-    return !BITBAND( SNES_RESET_REG->FIOPIN, SNES_RESET_BIT );
+uint8_t get_snes_reset() {
+  return !BITBAND(SNES_RESET_REG->FIOPIN, SNES_RESET_BIT);
 }

 /*
@ -113,123 +105,85 @@ uint8_t get_snes_reset()
 */
 uint32_t diffcount = 0, samecount = 0, didnotsave = 0;
 uint8_t sram_valid = 0;
-void snes_main_loop()
-{
-    if ( !romprops.ramsize_bytes )
-    {
-        return;
+void snes_main_loop() {
+  if(!romprops.ramsize_bytes)return;
+  if(initloop) {
+    saveram_crc_old = calc_sram_crc(SRAM_SAVE_ADDR, romprops.ramsize_bytes);
+    initloop=0;
  }
-
-    if ( initloop )
-    {
-        saveram_crc_old = calc_sram_crc( SRAM_SAVE_ADDR, romprops.ramsize_bytes );
-        initloop = 0;
-    }
-
-    saveram_crc = calc_sram_crc( SRAM_SAVE_ADDR, romprops.ramsize_bytes );
+  saveram_crc = calc_sram_crc(SRAM_SAVE_ADDR, romprops.ramsize_bytes);
  sram_valid = sram_reliable();
-
-    if ( crc_valid && sram_valid )
-    {
-        if ( saveram_crc != saveram_crc_old )
-        {
-            if ( samecount )
-            {
-                diffcount = 1;
-            }
-            else
-            {
+  if(crc_valid && sram_valid) {
+    if(saveram_crc != saveram_crc_old) {
+      if(samecount) {
+        diffcount=1;
+      } else {
        diffcount++;
        didnotsave++;
      }
-
-            samecount = 0;
+      samecount=0;
    }
-
-        if ( saveram_crc == saveram_crc_old )
-        {
+    if(saveram_crc == saveram_crc_old) {
      samecount++;
    }
-
-        if ( diffcount >= 1 && samecount == 5 )
-        {
-            printf( "SaveRAM CRC: 0x%04lx; saving %s\n", saveram_crc, file_lfn );
-            writeled( 1 );
-            save_sram( file_lfn, romprops.ramsize_bytes, SRAM_SAVE_ADDR );
-            writeled( 0 );
-            didnotsave = 0;
+    if(diffcount>=1 && samecount==5) {
+      printf("SaveRAM CRC: 0x%04lx; saving %s\n", saveram_crc, file_lfn);
+      writeled(1);
+      save_sram(file_lfn, romprops.ramsize_bytes, SRAM_SAVE_ADDR);
+      writeled(0);
+      didnotsave=0;
    }
-
-        if ( didnotsave > 50 )
-        {
-            printf( "periodic save (sram contents keep changing...)\n" );
-            diffcount = 0;
-            writeled( 1 );
-            save_sram( file_lfn, romprops.ramsize_bytes, SRAM_SAVE_ADDR );
-            didnotsave = 0;
-            writeled( 1 );
+    if(didnotsave>50) {
+      printf("periodic save (sram contents keep changing...)\n");
+      diffcount=0;
+      writeled(1);
+      save_sram(file_lfn, romprops.ramsize_bytes, SRAM_SAVE_ADDR);
+      didnotsave=0;
+      writeled(1);
    }
-
    saveram_crc_old = saveram_crc;
  }
-
-    printf( "crc=%lx crc_valid=%d sram_valid=%d diffcount=%ld samecount=%ld, didnotsave=%ld\n", saveram_crc, crc_valid,
-            sram_valid, diffcount, samecount, didnotsave );
+  printf("crc=%lx crc_valid=%d sram_valid=%d diffcount=%ld samecount=%ld, didnotsave=%ld\n", saveram_crc, crc_valid, sram_valid, diffcount, samecount, didnotsave);
 }

 /*
 * SD2SNES menu loop.
 * monitors menu selection. return when selection was made.
 */
-uint8_t menu_main_loop()
-{
+uint8_t menu_main_loop() {
  uint8_t cmd = 0;
-    sram_writebyte( 0, SRAM_CMD_ADDR );
-
-    while ( !cmd )
-    {
-        if ( !get_snes_reset() )
-        {
-            while ( !sram_reliable() )
-            {
-                printf( "hurr\n" );
+  sram_writebyte(0, SRAM_CMD_ADDR);
+  while(!cmd) {
+    if(!get_snes_reset()) {
+      while(!sram_reliable())printf("hurr\n");
+      cmd = sram_readbyte(SRAM_CMD_ADDR);
    }
-
-            cmd = sram_readbyte( SRAM_CMD_ADDR );
-            //cmd  = SNES_CMD_LOADSPC;
-        }
-
-        if ( get_snes_reset() )
-        {
+    if(get_snes_reset()) {
      cmd = 0;
    }
-
-        sleep_ms( 20 );
+    sleep_ms(20);
    cli_entrycheck();
  }
-
  return cmd;
 }

-void get_selected_name( uint8_t *fn )
-{
+void get_selected_name(uint8_t* fn) {
  uint32_t addr;
-    addr = sram_readlong( SRAM_PARAM_ADDR );
-    printf( "fd addr=%lx\n", addr );
-    sram_readblock( fn, addr + 7 + SRAM_MENU_ADDR, 256 );
-    //memcpy(fn, "dossier sans titre/ff6.sfc", 28);
+  addr = sram_readlong(SRAM_PARAM_ADDR);
+  printf("fd addr=%lx\n", addr);
+  sram_readblock(fn, addr + 7 + SRAM_MENU_ADDR, 256);
 }

-void snes_bootprint( void *msg )
+void snes_bootprint(void* msg)
 {
-    printf( "SNES SAY: %s\n", ( char * )msg );
-    sram_writeblock( msg, SRAM_CMD_ADDR, 33 );
+  printf("%s\n", (char*)msg);
+  sram_writeblock(msg, SRAM_CMD_ADDR, 33);
 }

-void snes_menu_errmsg( int err, void *msg )
+void snes_menu_errmsg(int err, void* msg)
 {
-    printf( "%d: %s\n", err, ( char * )msg );
-    sram_writeblock( msg, SRAM_CMD_ADDR + 1, 64 );
-    sram_writebyte( err, SRAM_CMD_ADDR );
+  printf("%d: %s\n", err, (char*)msg);
+  sram_writeblock(msg, SRAM_CMD_ADDR+1, 64);
+  sram_writebyte(err, SRAM_CMD_ADDR);
 }
  
--- a/src/snes.h
+++ b/src/snes.h
@ -38,18 +38,18 @@
 #define MENU_ERR_NODSP  (1)
 #define MENU_ERR_NOBSX  (2)

-#define SNES_RESET_PULSELEN_MS  (100)
+#define SNES_RESET_PULSELEN_MS	(1)

 uint8_t crc_valid;

-void prepare_reset( void );
-void snes_init( void );
-void snes_reset_pulse( void );
-void snes_reset( int state );
-uint8_t get_snes_reset( void );
-void snes_main_loop( void );
-uint8_t menu_main_loop( void );
-void get_selected_name( uint8_t *lfn );
-void snes_bootprint( void *msg );
-void snes_menu_errmsg( int err, void *msg );
+void prepare_reset(void);
+void snes_init(void);
+void snes_reset_pulse(void);
+void snes_reset(int state);
+uint8_t get_snes_reset(void);
+void snes_main_loop(void);
+uint8_t menu_main_loop(void);
+void get_selected_name(uint8_t* lfn);
+void snes_bootprint(void* msg);
+void snes_menu_errmsg(int err, void* msg);
 #endif
--- a/src/snesboot.h
+++ b/src/snesboot.h
@ -1,295 +1,330 @@
 const uint8_t bootrle[] = {
-0xE2, 0x20, 0xC2, 0x10, 0xA9, 0x00, 0x48, 0xAB, 0xAD, 
-0x10, 0x42, 0xA2, 0x00, 0x58, 0x8E, 0x16, 0x21, 0xA9, 
-0x01, 0x8D, 0x15, 0x00, 0xA2, 0x00, 0xB0, 0xA9, 0x7F, 
-0x8E, 0x10, 0x00, 0x8D, 0x0F, 0x00, 0xA2, 0x00, 0x09, 
-0x8E, 0x13, 0x00, 0xA9, 0x18, 0x8D, 0x12, 0x00, 0x20, 
-0xDC, 0x0B, 0xA9, 0x01, 0x8D, 0x16, 0x00, 0x6B, 0xE2, 
-0x20, 0xAD, 0x11, 0x42, 0x6B, 0xE2, 0x20, 0xC2, 0x10, 
-0x78, 0x9C, 0x00, 0x42, 0x20, 0x2A, 0x01, 0xA9, 0x01, 
-0x8D, 0x0D, 0x42, 0x20, 0x84, 0x02, 0x20, 0x93, 0x01, 
-0x20, 0x8B, 0x01, 0x20, 0x04, 0x0C, 0x20, 0x57, 0x02, 
-0xA2, 0x41, 0x00, 0xA9, 0x00, 0xCA, 0x9F, 0x00, 0x70, 
-0x30, 0xD0, 0xF9, 0xA9, 0x7E, 0xA2, 0x1B, 0x00, 0x8D, 
-0x83, 0x21, 0x8E, 0x81, 0x21, 0xA9, 0x00, 0x8D, 0x15, 
-0x00, 0xA2, 0xBC, 0x00, 0xA9, 0xC0, 0x8E, 0x10, 0x00, 
-0x8D, 0x0F, 0x00, 0xA2, 0x6F, 0x00, 0x8E, 0x13, 0x00, 
-0xA9, 0x80, 0x8D, 0x12, 0x00, 0x20, 0xDC, 0x0B, 0xA9, 
-0x7E, 0xA2, 0x8B, 0x00, 0x8D, 0x83, 0x21, 0x8E, 0x81, 
-0x21, 0xA9, 0x00, 0x8D, 0x15, 0x00, 0xA2, 0x8C, 0x0B, 
-0xA9, 0xC0, 0x8E, 0x10, 0x00, 0x8D, 0x0F, 0x00, 0xA2, 
-0x4F, 0x00, 0x8E, 0x13, 0x00, 0xA9, 0x80, 0x8D, 0x12, 
-0x00, 0x20, 0xDC, 0x0B, 0x22, 0x1B, 0x00, 0x7E, 0xC2, 
-0x10, 0xE2, 0x20, 0xA9, 0x00, 0x8F, 0x00, 0x00, 0x7E, 
-0xA9, 0x0D, 0x8F, 0x02, 0x00, 0x7E, 0xA9, 0x30, 0x8F, 
-0x06, 0x00, 0x7E, 0xC2, 0x20, 0xA9, 0x00, 0x70, 0x8F, 
-0x04, 0x00, 0x7E, 0xE2, 0x20, 0xA9, 0x00, 0x8F, 0x07, 
-0x00, 0x7E, 0x20, 0x8B, 0x00, 0xC2, 0x20, 0xA9, 0x00, 
-0x58, 0x8D, 0x16, 0x21, 0xE2, 0x20, 0xA9, 0x01, 0x8D, 
-0x00, 0x43, 0xA9, 0x18, 0x8D, 0x01, 0x43, 0xA9, 0x7F, 
-0x8D, 0x04, 0x43, 0xA2, 0x00, 0xB0, 0x8E, 0x02, 0x43, 
-0xA2, 0x00, 0x09, 0x8E, 0x05, 0x43, 0xAF, 0x12, 0x42, 
-0x00, 0x29, 0x80, 0xD0, 0xF8, 0xAF, 0x12, 0x42, 0x00, 
-0x29, 0x80, 0xF0, 0xF8, 0xA9, 0x01, 0x8D, 0x0B, 0x42, 
-0x80, 0x9A, 0x58, 0x9C, 0x00, 0x42, 0x5C, 0x19, 0x00, 
-0x7E, 0x9C, 0x0B, 0x42, 0x9C, 0x0C, 0x42, 0x9C, 0x10, 
-0x43, 0x9C, 0x11, 0x43, 0x9C, 0x12, 0x43, 0x9C, 0x13, 
-0x43, 0x9C, 0x14, 0x43, 0x9C, 0x20, 0x43, 0x9C, 0x21, 
-0x43, 0x9C, 0x22, 0x43, 0x9C, 0x23, 0x43, 0x9C, 0x24, 
-0x43, 0x9C, 0x30, 0x43, 0x9C, 0x31, 0x43, 0x9C, 0x32, 
-0x43, 0x9C, 0x33, 0x43, 0x9C, 0x34, 0x43, 0x9C, 0x40, 
-0x43, 0x9C, 0x41, 0x43, 0x9C, 0x42, 0x43, 0x9C, 0x43, 
-0x43, 0x9C, 0x44, 0x43, 0x9C, 0x50, 0x43, 0x9C, 0x51, 
-0x43, 0x9C, 0x52, 0x43, 0x9C, 0x53, 0x43, 0x9C, 0x54, 
-0x43, 0x60, 0xAD, 0x12, 0x42, 0x29, 0x80, 0xD0, 0xF9, 
-0xAD, 0x12, 0x42, 0x29, 0x80, 0xF0, 0xF9, 0x60, 0xE2, 
-0x20, 0xC2, 0x10, 0x9C, 0x30, 0x21, 0x60, 0xE2, 0x20, 
-0xC2, 0x10, 0x9C, 0x00, 0x42, 0x9C, 0x0B, 0x42, 0x9C, 
-0x0C, 0x42, 0xA2, 0x00, 0xB0, 0x8E, 0x81, 0x21, 0xA9, 
-0x01, 0x8D, 0x83, 0x21, 0xA9, 0x08, 0x8D, 0x15, 0x00, 
-0xA2, 0x59, 0xFF, 0xA9, 0xC0, 0x8E, 0x10, 0x00, 0x8D, 
-0x0F, 0x00, 0xA2, 0x40, 0x07, 0x8E, 0x13, 0x00, 0xA9, 
-0x80, 0x8D, 0x12, 0x00, 0x20, 0xDC, 0x0B, 0xA2, 0x00, 
-0x00, 0x8E, 0x16, 0x21, 0xA9, 0x01, 0x8D, 0x15, 0x00, 
-0xA2, 0x7C, 0x03, 0xA9, 0xC0, 0x8E, 0x10, 0x00, 0x8D, 
-0x0F, 0x00, 0xA2, 0x00, 0x08, 0x8E, 0x13, 0x00, 0xA9, 
-0x18, 0x8D, 0x12, 0x00, 0x20, 0xDC, 0x0B, 0xA2, 0x00, 
-0x58, 0x8E, 0x16, 0x21, 0xA9, 0x09, 0x8D, 0x15, 0x00, 
-0xA2, 0x59, 0xFF, 0xA9, 0xC0, 0x8E, 0x10, 0x00, 0x8D, 
-0x0F, 0x00, 0xA2, 0x40, 0x07, 0x8E, 0x13, 0x00, 0xA9, 
-0x18, 0x8D, 0x12, 0x00, 0x20, 0xDC, 0x0B, 0xA2, 0x00, 
-0x00, 0x8E, 0x02, 0x21, 0xA9, 0x08, 0x8D, 0x15, 0x00, 
-0xA2, 0x59, 0xFF, 0xA9, 0xC0, 0x8E, 0x10, 0x00, 0x8D, 
-0x0F, 0x00, 0xA2, 0x20, 0x02, 0x8E, 0x13, 0x00, 0xA9, 
-0x04, 0x8D, 0x12, 0x00, 0x20, 0xDC, 0x0B, 0x9C, 0x21, 
-0x21, 0xA9, 0x00, 0x8D, 0x15, 0x00, 0xA2, 0x7C, 0x0B, 
-0xA9, 0xC0, 0x8E, 0x10, 0x00, 0x8D, 0x0F, 0x00, 0xA2, 
-0x10, 0x00, 0x8E, 0x13, 0x00, 0xA9, 0x22, 0x8D, 0x12, 
-0x00, 0x20, 0xDC, 0x0B, 0x60, 0xE2, 0x20, 0xC2, 0x10, 
-0xA9, 0x00, 0x8D, 0x05, 0x21, 0xA9, 0x58, 0x09, 0x02, 
-0x8D, 0x07, 0x21, 0xA9, 0x40, 0x8D, 0x0B, 0x21, 0xA9, 
-0x01, 0x8D, 0x2C, 0x21, 0xA9, 0x01, 0x8D, 0x2D, 0x21, 
-0xA9, 0x00, 0x8D, 0x30, 0x21, 0x9C, 0x21, 0x21, 0xA9, 
-0x0F, 0x8D, 0x00, 0x21, 0x60, 0xE2, 0x20, 0xC2, 0x10, 
-0x9C, 0x00, 0x42, 0xA9, 0xFF, 0x8D, 0x01, 0x42, 0x9C, 
-0x02, 0x42, 0x9C, 0x03, 0x42, 0x9C, 0x04, 0x42, 0x9C, 
-0x05, 0x42, 0x9C, 0x06, 0x42, 0x9C, 0x07, 0x42, 0x9C, 
-0x08, 0x42, 0x9C, 0x09, 0x42, 0x9C, 0x0A, 0x42, 0x9C, 
-0x0B, 0x42, 0x9C, 0x0C, 0x42, 0xA9, 0x00, 0x8D, 0x0D, 
-0x42, 0xA9, 0x8F, 0x8D, 0x00, 0x21, 0xA9, 0x03, 0x8D, 
-0x01, 0x21, 0x9C, 0x02, 0x21, 0x9C, 0x03, 0x21, 0x9C, 
-0x05, 0x21, 0x9C, 0x06, 0x21, 0x9C, 0x07, 0x21, 0x9C, 
-0x08, 0x21, 0x9C, 0x09, 0x21, 0x9C, 0x0A, 0x21, 0x9C, 
-0x0B, 0x21, 0x9C, 0x0C, 0x21, 0x9C, 0x0D, 0x21, 0x9C, 
-0x0D, 0x21, 0x9C, 0x0E, 0x21, 0x9C, 0x0E, 0x21, 0x9C, 
-0x0F, 0x21, 0x9C, 0x0F, 0x21, 0xA9, 0x05, 0x8D, 0x10, 
-0x21, 0x9C, 0x10, 0x21, 0x9C, 0x11, 0x21, 0x9C, 0x11, 
-0x21, 0x9C, 0x12, 0x21, 0x9C, 0x12, 0x21, 0x9C, 0x13, 
-0x21, 0x9C, 0x13, 0x21, 0x9C, 0x14, 0x21, 0x9C, 0x14, 
-0x21, 0xA9, 0x80, 0x8D, 0x15, 0x21, 0x9C, 0x16, 0x21, 
-0x9C, 0x17, 0x21, 0x9C, 0x1A, 0x21, 0x9C, 0x1B, 0x21, 
-0xA9, 0x01, 0x8D, 0x1B, 0x21, 0x9C, 0x1C, 0x21, 0x9C, 
-0x1C, 0x21, 0x9C, 0x1D, 0x21, 0x9C, 0x1D, 0x21, 0x9C, 
-0x1E, 0x21, 0x8D, 0x1E, 0x21, 0x9C, 0x1F, 0x21, 0x9C, 
-0x1F, 0x21, 0x9C, 0x20, 0x21, 0x9C, 0x20, 0x21, 0x9C, 
-0x21, 0x21, 0x9C, 0x23, 0x21, 0x9C, 0x24, 0x21, 0x9C, 
-0x25, 0x21, 0x9C, 0x26, 0x21, 0x9C, 0x27, 0x21, 0x9C, 
-0x28, 0x21, 0x9C, 0x29, 0x21, 0x9C, 0x2A, 0x21, 0x9C, 
-0x2B, 0x21, 0x9C, 0x2C, 0x21, 0x9C, 0x2D, 0x21, 0x9C, 
-0x2E, 0x21, 0xA9, 0x30, 0x8D, 0x30, 0x21, 0x9C, 0x31, 
-0x21, 0xA9, 0xE0, 0x8D, 0x32, 0x21, 0x9C, 0x33, 0x21, 
-0x60, 0x77, 0x00, 0x11, 0x02, 0x30, 0x30, 0x48, 0x30, 
-0x48, 0x30, 0x48, 0x20, 0x58, 0x00, 0x30, 0x30, 0x48, 
-0x00, 0x30, 0x00, 0x6C, 0x6C, 0x92, 0x24, 0x5A, 0x00, 
-0x36, 0x5B, 0x00, 0x09, 0x6C, 0x6C, 0x92, 0xFE, 0x01, 
-0x6C, 0x92, 0xFE, 0x01, 0x6C, 0x92, 0x00, 0x6C, 0x00, 
-0x00, 0x10, 0x6C, 0x7C, 0xC6, 0xC6, 0x39, 0xF0, 0x0E, 
-0x1E, 0xE1, 0xC6, 0x39, 0x7C, 0xC6, 0x10, 0x6C, 0x42, 
-0xA5, 0xA4, 0x5A, 0x48, 0xB4, 0x10, 0x6C, 0x24, 0x5A, 
-0x4A, 0xB5, 0x84, 0x4A, 0x00, 0x84, 0x70, 0xC8, 0xC0, 
-0x34, 0xC4, 0x2E, 0x6E, 0xDB, 0xC4, 0x2A, 0xC4, 0x3A, 
-0x7C, 0xC6, 0x00, 0x7C, 0x00, 0x18, 0x18, 0x24, 0x10, 
-0x28, 0x00, 0x10, 0x5B, 0x00, 0x08, 0x18, 0x24, 0x30, 
-0x68, 0x30, 0x48, 0x30, 0x48, 0x30, 0x48, 0x30, 0x68, 
-0x18, 0x24, 0x00, 0x18, 0x30, 0x48, 0x18, 0x2C, 0x18, 
-0x24, 0x18, 0x24, 0x18, 0x24, 0x18, 0x2C, 0x30, 0x48, 
-0x00, 0x30, 0x00, 0x6C, 0x6C, 0x92, 0x38, 0x44, 0x7C, 
-0x82, 0x38, 0x44, 0x6C, 0x92, 0x00, 0x6C, 0x00, 0x00, 
-0x00, 0x18, 0x18, 0x24, 0x18, 0x66, 0x7E, 0x81, 0x18, 
-0x66, 0x18, 0x24, 0x00, 0x18, 0x5B, 0x00, 0x0B, 0x18, 
-0x18, 0x24, 0x18, 0x24, 0x10, 0x28, 0x5B, 0x00, 0x05, 
-0x7E, 0x7E, 0x81, 0x00, 0x7E, 0x5B, 0x00, 0x0F, 0x18, 
-0x18, 0x24, 0x18, 0x24, 0x00, 0x18, 0x03, 0x04, 0x06, 
-0x09, 0x0C, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x90, 
-0xC0, 0x20, 0x00, 0xC0, 0x7C, 0xC6, 0xE6, 0x39, 0xC6, 
-0x29, 0xC6, 0x29, 0xC6, 0x29, 0xCE, 0x39, 0x7C, 0xC6, 
-0x00, 0x7C, 0x18, 0x34, 0x18, 0x24, 0x18, 0x24, 0x18, 
-0x24, 0x18, 0x24, 0x18, 0x24, 0x18, 0x24, 0x00, 0x18, 
-0xFC, 0x06, 0x06, 0xF9, 0x06, 0x79, 0x7C, 0x86, 0xC0, 
-0xBC, 0xC0, 0x3E, 0xFE, 0x01, 0x00, 0xFE, 0xFC, 0x06, 
-0x06, 0xF9, 0x06, 0x39, 0x3C, 0x46, 0x06, 0x39, 0x06, 
-0xF9, 0xFC, 0x06, 0x00, 0xFC, 0xC6, 0x29, 0xC6, 0x29, 
-0xC6, 0x39, 0x7E, 0xC1, 0x06, 0x79, 0x06, 0x09, 0x06, 
-0x09, 0x00, 0x06, 0xFE, 0x01, 0xC0, 0x3E, 0xC0, 0x3C, 
-0xFC, 0x06, 0x06, 0xF9, 0x06, 0xF9, 0xFC, 0x06, 0x00, 
-0xF8, 0x7C, 0xC2, 0xC0, 0x3C, 0xC0, 0x3C, 0xFC, 0x06, 
-0xC6, 0x39, 0xC6, 0x39, 0x7C, 0xC6, 0x00, 0x7C, 0xFC, 
-0x06, 0x06, 0xF9, 0x06, 0x09, 0x06, 0x09, 0x06, 0x09, 
-0x06, 0x09, 0x06, 0x09, 0x00, 0x06, 0x7C, 0xC6, 0xC6, 
-0x39, 0xC6, 0x39, 0x7C, 0xC6, 0xC6, 0x39, 0xC6, 0x39, 
-0x7C, 0xC6, 0x00, 0x7C, 0x7C, 0xC6, 0xC6, 0x39, 0xC6, 
-0x39, 0x7E, 0xC1, 0x06, 0x79, 0x06, 0x79, 0x7C, 0x86, 
-0x00, 0x7C, 0x00, 0x00, 0x00, 0x30, 0x30, 0x48, 0x00, 
-0x30, 0x00, 0x30, 0x30, 0x48, 0x00, 0x30, 0x5B, 0x00, 
-0x05, 0x30, 0x30, 0x48, 0x00, 0x30, 0x00, 0x30, 0x30, 
-0x48, 0x20, 0x50, 0x00, 0x20, 0x00, 0x18, 0x18, 0x24, 
-0x30, 0x48, 0x60, 0x90, 0x30, 0x48, 0x18, 0x24, 0x00, 
-0x18, 0x5B, 0x00, 0x05, 0x3C, 0x3C, 0x42, 0x00, 0x3C, 
-0x00, 0x3C, 0x3C, 0x42, 0x00, 0x3C, 0x00, 0x00, 0x00, 
-0x30, 0x30, 0x48, 0x18, 0x24, 0x0C, 0x12, 0x18, 0x24, 
-0x30, 0x48, 0x00, 0x30, 0x00, 0x00, 0xF8, 0x0C, 0x0C, 
-0xF2, 0x0C, 0x12, 0x18, 0x24, 0x30, 0x48, 0x00, 0x30, 
-0x30, 0x48, 0x00, 0x30, 0x7C, 0xC6, 0xC6, 0x39, 0xC6, 
-0x39, 0xDE, 0x21, 0xDE, 0x21, 0xC0, 0x3E, 0x7E, 0xC1, 
-0x00, 0x7E, 0x7C, 0xC6, 0xC6, 0x39, 0xC6, 0x39, 0xDE, 
-0x21, 0xC6, 0x39, 0xC6, 0x29, 0xC6, 0x29, 0x00, 0xC6, 
-0xFC, 0x06, 0xC6, 0x39, 0xC6, 0x39, 0xDC, 0x26, 0xC6, 
-0x39, 0xC6, 0x39, 0xFC, 0x06, 0x00, 0xFC, 0x7E, 0xC1, 
-0xC0, 0x3E, 0xC0, 0x20, 0xC0, 0x20, 0xC0, 0x20, 0xC0, 
-0x3E, 0x7E, 0xC1, 0x00, 0x7E, 0xFC, 0x02, 0xC6, 0x3B, 
-0xC6, 0x29, 0xC6, 0x29, 0xC6, 0x29, 0xC6, 0x3B, 0xFC, 
-0x02, 0x00, 0xFC, 0xFE, 0x01, 0xC0, 0x3E, 0xC0, 0x38, 
-0xF8, 0x04, 0xC0, 0x38, 0xC0, 0x3E, 0xFE, 0x01, 0x00, 
-0xFE, 0xFE, 0x01, 0xC0, 0x3E, 0xC0, 0x38, 0xF8, 0x04, 
-0xC0, 0x38, 0xC0, 0x20, 0xC0, 0x20, 0x00, 0xC0, 0x7E, 
-0xC1, 0xC0, 0x3E, 0xC0, 0x2E, 0xCE, 0x33, 0xC6, 0x29, 
-0xC6, 0x39, 0x7C, 0xC6, 0x00, 0x7C, 0xC6, 0x29, 0xC6, 
-0x29, 0xC6, 0x39, 0xFE, 0x01, 0xC6, 0x39, 0xC6, 0x29, 
-0xC6, 0x29, 0x00, 0xC6, 0x18, 0x24, 0x18, 0x24, 0x18, 
-0x24, 0x18, 0x24, 0x18, 0x24, 0x18, 0x24, 0x18, 0x24, 
-0x00, 0x18, 0x0C, 0x12, 0x0C, 0x12, 0x0C, 0x12, 0x0C, 
-0x12, 0x0C, 0x12, 0x0C, 0xF6, 0xF8, 0x06, 0x00, 0xFC, 
-0xC6, 0x29, 0xC6, 0x29, 0xC6, 0x38, 0xFC, 0x06, 0xC6, 
-0x39, 0xC6, 0x29, 0xC6, 0x29, 0x00, 0xC7, 0xC0, 0x20, 
-0xC0, 0x20, 0xC0, 0x20, 0xC0, 0x20, 0xC0, 0x20, 0xC0, 
-0x3C, 0xFC, 0x02, 0x00, 0xFC, 0xEC, 0x16, 0xD6, 0x29, 
-0xD6, 0x29, 0xD6, 0x29, 0xC6, 0x39, 0xC6, 0x29, 0xC6, 
-0x29, 0x00, 0xC7, 0xFC, 0x06, 0xC6, 0x39, 0xC6, 0x29, 
-0xC6, 0x29, 0xC6, 0x29, 0xC6, 0x29, 0xC6, 0x29, 0x00, 
-0xC6, 0x7C, 0xC6, 0xC6, 0x39, 0xC6, 0x29, 0xC6, 0x29, 
-0xC6, 0x29, 0xC6, 0x39, 0x7C, 0xC6, 0x00, 0x7C, 0xFC, 
-0x06, 0xC6, 0x39, 0xC6, 0x29, 0xC6, 0x39, 0xFC, 0x06, 
-0xC0, 0x3C, 0xC0, 0x20, 0x00, 0xC0, 0x7C, 0x82, 0xC6, 
-0xBB, 0xC6, 0x29, 0xC6, 0x29, 0xC6, 0x29, 0xCE, 0x31, 
-0x7E, 0xC1, 0x00, 0x7E, 0xFC, 0x06, 0xC6, 0x39, 0xC6, 
-0x39, 0xFC, 0x06, 0xC6, 0x39, 0xC6, 0x29, 0xC6, 0x29, 
-0x00, 0xC6, 0x7E, 0xC1, 0xC0, 0x3E, 0xC0, 0x3C, 0x7C, 
-0xC6, 0x06, 0x79, 0x06, 0xF9, 0xFC, 0x06, 0x00, 0xFC, 
-0xFE, 0x01, 0x18, 0xE6, 0x18, 0x24, 0x18, 0x24, 0x18, 
-0x24, 0x18, 0x24, 0x18, 0x24, 0x00, 0x18, 0xC6, 0x29, 
-0xC6, 0x29, 0xC6, 0x29, 0xC6, 0x29, 0xC6, 0x29, 0xC6, 
-0x39, 0x7C, 0xC6, 0x00, 0x7C, 0xC6, 0x29, 0xC6, 0x29, 
-0xC6, 0x29, 0xC6, 0x29, 0x66, 0x99, 0x36, 0x49, 0x1E, 
-0x21, 0x00, 0x1F, 0xC6, 0x29, 0xC6, 0x29, 0xC6, 0x39, 
-0xD6, 0x29, 0xD6, 0x29, 0xD6, 0x29, 0x6E, 0xD1, 0x00, 
-0x6E, 0xC6, 0x29, 0xC6, 0x29, 0xC6, 0x39, 0x7C, 0xC6, 
-0xC6, 0x39, 0xC6, 0x29, 0xC6, 0x29, 0x00, 0xC6, 0xC6, 
-0x29, 0xC6, 0x29, 0xC6, 0x39, 0x7E, 0xC1, 0x06, 0x79, 
-0x06, 0xF9, 0xFC, 0x06, 0x00, 0xFC, 0xFE, 0x01, 0x06, 
-0xF9, 0x06, 0x79, 0x7C, 0xC6, 0xC0, 0x3C, 0xC0, 0x3E, 
-0xFE, 0x01, 0x00, 0xFE, 0x3C, 0x42, 0x30, 0x4C, 0x30, 
-0x48, 0x30, 0x48, 0x30, 0x48, 0x30, 0x4C, 0x3C, 0x42, 
-0x00, 0x3C, 0xC0, 0x20, 0x60, 0x90, 0x30, 0x48, 0x18, 
-0x24, 0x0C, 0x12, 0x06, 0x09, 0x03, 0x04, 0x00, 0x03, 
-0x3C, 0x42, 0x0C, 0x32, 0x0C, 0x12, 0x0C, 0x12, 0x0C, 
-0x12, 0x0C, 0x32, 0x3C, 0x42, 0x00, 0x3C, 0x18, 0x24, 
-0x3C, 0x66, 0x66, 0x99, 0x00, 0x66, 0x5B, 0x00, 0x13, 
-0x7E, 0x7E, 0x81, 0x00, 0x7E, 0x30, 0x48, 0x18, 0x24, 
-0x18, 0x24, 0x00, 0x18, 0x5B, 0x00, 0x0B, 0x7C, 0x7C, 
-0x86, 0x06, 0x79, 0x7E, 0xC1, 0xC6, 0x39, 0x7E, 0xC1, 
-0x00, 0x7E, 0xC0, 0x20, 0xC0, 0x3C, 0xFC, 0x06, 0xC6, 
-0x39, 0xC6, 0x29, 0xC6, 0x39, 0xFC, 0x06, 0x00, 0xFC, 
-0x00, 0x00, 0x00, 0x7E, 0x7E, 0xC1, 0xC0, 0x3E, 0xC0, 
-0x20, 0xC0, 0x3E, 0x7E, 0xC1, 0x00, 0x7E, 0x06, 0x09, 
-0x06, 0x79, 0x7E, 0xC1, 0xC6, 0x39, 0xC6, 0x29, 0xC6, 
-0x39, 0x7E, 0xC1, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x7C, 
-0x7C, 0xC6, 0xC6, 0x39, 0xFE, 0x01, 0xC0, 0x3E, 0x7E, 
-0xC3, 0x00, 0x7E, 0x1E, 0x21, 0x30, 0x6E, 0x30, 0x4C, 
-0x3C, 0x42, 0x30, 0x4C, 0x30, 0x48, 0x30, 0x48, 0x30, 
-0x48, 0x00, 0x00, 0x00, 0x7E, 0x7E, 0xC1, 0xC6, 0x39, 
-0xC6, 0x39, 0x7E, 0xC1, 0x06, 0x79, 0x7C, 0x86, 0xC0, 
-0x20, 0xC0, 0x3C, 0xFC, 0x06, 0xC6, 0x39, 0xC6, 0x29, 
-0xC6, 0x29, 0xC6, 0x29, 0x00, 0xC6, 0x00, 0x18, 0x18, 
-0x24, 0x00, 0x18, 0x18, 0x24, 0x18, 0x24, 0x18, 0x24, 
-0x18, 0x24, 0x00, 0x18, 0x00, 0x18, 0x18, 0x24, 0x00, 
-0x18, 0x18, 0x24, 0x18, 0x24, 0x18, 0x24, 0x18, 0x2C, 
-0x30, 0x48, 0xC0, 0x20, 0xC0, 0x26, 0xC6, 0x29, 0xC6, 
-0x2B, 0xFC, 0x06, 0xC6, 0x2B, 0xC6, 0x29, 0x00, 0xC7, 
-0x30, 0x48, 0x30, 0x48, 0x30, 0x48, 0x30, 0x48, 0x30, 
-0x48, 0x30, 0x68, 0x18, 0x24, 0x00, 0x1C, 0x00, 0x00, 
-0x00, 0xEC, 0xEC, 0x16, 0xD6, 0x29, 0xD6, 0x29, 0xD6, 
-0x29, 0xC6, 0x39, 0x00, 0xC7, 0x00, 0x00, 0x00, 0xFC, 
-0xFC, 0x06, 0xC6, 0x39, 0xC6, 0x29, 0xC6, 0x29, 0xC6, 
-0x29, 0x00, 0xC6, 0x00, 0x00, 0x00, 0x7C, 0x7C, 0xC6, 
-0xC6, 0x39, 0xC6, 0x29, 0xC6, 0x39, 0x7C, 0xC6, 0x00, 
-0x7C, 0x00, 0x00, 0x00, 0xFC, 0xFC, 0x06, 0xC6, 0x39, 
-0xC6, 0x39, 0xFC, 0x06, 0xC0, 0x3C, 0xC0, 0x20, 0x00, 
-0x00, 0x00, 0x7E, 0x7E, 0xC1, 0xC6, 0x39, 0xC6, 0x39, 
-0x7E, 0xC1, 0x06, 0x79, 0x06, 0x09, 0x00, 0x00, 0x00, 
-0x7C, 0x7C, 0xC2, 0xC0, 0x3C, 0xC0, 0x20, 0xC0, 0x20, 
-0xC0, 0x20, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x7E, 0x7E, 
-0xC1, 0xC0, 0x3E, 0x7C, 0xC6, 0x06, 0xF9, 0xFC, 0x06, 
-0x00, 0xFC, 0x30, 0x48, 0x30, 0x4C, 0x3C, 0x42, 0x30, 
-0x4C, 0x30, 0x48, 0x30, 0x4E, 0x1E, 0x31, 0x00, 0x1E, 
-0x00, 0x00, 0x00, 0xC6, 0xC6, 0x29, 0xC6, 0x29, 0xC6, 
-0x29, 0xC6, 0x39, 0x7C, 0xC6, 0x00, 0x7C, 0x00, 0x00, 
-0x00, 0xC6, 0xC6, 0x29, 0xC6, 0x29, 0x66, 0x99, 0x36, 
-0x49, 0x1E, 0x21, 0x00, 0x1E, 0x00, 0x00, 0x00, 0xC6, 
-0xC6, 0x39, 0xD6, 0x29, 0xD6, 0x29, 0xD6, 0x29, 0x6E, 
-0xD1, 0x00, 0x6E, 0x00, 0x00, 0x00, 0xC6, 0xC6, 0x29, 
-0xC6, 0x39, 0x7C, 0xC6, 0xC6, 0x39, 0xC6, 0x29, 0x00, 
-0xC6, 0x00, 0x00, 0x00, 0xC6, 0xC6, 0x29, 0xC6, 0x39, 
-0x7E, 0xC1, 0x06, 0x79, 0x06, 0xF9, 0xFC, 0x06, 0x00, 
-0x00, 0x00, 0xFE, 0xFE, 0x01, 0x06, 0xF9, 0x7C, 0xC6, 
-0xC0, 0x3E, 0xFE, 0x01, 0x00, 0xFE, 0x18, 0x24, 0x30, 
-0x48, 0x30, 0x48, 0x70, 0x88, 0x30, 0x48, 0x30, 0x48, 
-0x18, 0x24, 0x00, 0x18, 0x18, 0x24, 0x18, 0x24, 0x18, 
-0x24, 0x00, 0x18, 0x18, 0x24, 0x18, 0x24, 0x18, 0x24, 
-0x00, 0x18, 0x30, 0x48, 0x18, 0x24, 0x18, 0x24, 0x1C, 
-0x22, 0x18, 0x24, 0x18, 0x24, 0x30, 0x48, 0x00, 0x30, 
-0x00, 0x00, 0x00, 0x72, 0x72, 0x9D, 0xFE, 0x01, 0x9C, 
-0x72, 0x00, 0x9C, 0x5B, 0x00, 0x14, 0x42, 0x08, 0xFF, 
-0x7F, 0x00, 0x00, 0x9C, 0x73, 0x42, 0x08, 0xFF, 0x43, 
-0x00, 0x00, 0x18, 0x63, 0xC2, 0x30, 0xAD, 0x00, 0x00, 
-0x29, 0xFF, 0x00, 0x0A, 0x18, 0x69, 0x00, 0xB0, 0x8D, 
-0x09, 0x00, 0xAD, 0x02, 0x00, 0x29, 0xFF, 0x00, 0x5B, 
-0x0A, 0x06, 0x18, 0x6D, 0x09, 0x00, 0x8F, 0x81, 0x21, 
-0x00, 0xE2, 0x20, 0xA9, 0x7F, 0x8F, 0x83, 0x21, 0x00, 
-0xAE, 0x04, 0x00, 0xAD, 0x06, 0x00, 0x48, 0xAB, 0xBD, 
-0x00, 0x00, 0xF0, 0x11, 0x8F, 0x80, 0x21, 0x00, 0xA9, 
-0x00, 0x69, 0x00, 0x09, 0x20, 0x8F, 0x80, 0x21, 0x00, 
-0xE8, 0x80, 0xEA, 0xA9, 0x00, 0x48, 0xAB, 0x60, 0xFF, 
-0xC2, 0x10, 0xE2, 0x20, 0xAD, 0x15, 0x00, 0x8D, 0x00, 
-0x43, 0xAD, 0x12, 0x00, 0x8D, 0x01, 0x43, 0xAD, 0x0F, 
-0x00, 0xAE, 0x10, 0x00, 0x8E, 0x02, 0x43, 0x8D, 0x04, 
-0x43, 0xAE, 0x13, 0x00, 0x8E, 0x05, 0x43, 0xA9, 0x01, 
-0x8D, 0x0B, 0x42, 0x60, 0xE2, 0x20, 0xC2, 0x10, 0x9C, 
-0x0B, 0x42, 0x9C, 0x0C, 0x42, 0x9C, 0x00, 0x42, 0x60, 
-0x77, 0x00, 0xEE, 0xF2, 0x78, 0x18, 0xFB, 0x5C, 0x3B, 
-0x00, 0xC0, 0x08, 0xC2, 0x30, 0x48, 0xDA, 0x5A, 0x0B, 
-0x8B, 0x22, 0x35, 0x00, 0xC0, 0xC2, 0x30, 0xAB, 0x2B, 
-0x7A, 0xFA, 0x68, 0x28, 0x40, 0x08, 0xC2, 0x30, 0x48, 
-0xDA, 0x5A, 0x0B, 0x8B, 0x22, 0x00, 0x00, 0xC0, 0xC2, 
-0x30, 0xAB, 0x2B, 0x7A, 0xFA, 0x68, 0x28, 0x40, 0xCB, 
-0xAF, 0xEF, 0xCD, 0xAB, 0x80, 0xF9, 0x5B, 0x20, 0x1C, 
-0x76, 0x30, 0x2E, 0x31, 0x00, 0x00, 0x00, 0x5B, 0x20, 
-0x41, 0x00, 0x20, 0x3C, 0x64, 0x69, 0x72, 0x3E, 0x5B, 
-0x00, 0x0D, 0x4D, 0x52, 0x42, 0x4F, 0x4F, 0x54, 0x5B, 
-0x00, 0x0A, 0x53, 0x44, 0x32, 0x53, 0x4E, 0x45, 0x53, 
-0x20, 0x42, 0x4F, 0x4F, 0x54, 0x5B, 0x20, 0x09, 0x31, 
-0x02, 0x06, 0x03, 0x09, 0x33, 0x00, 0x4F, 0x87, 0xB0, 
-0x78, 0x5B, 0x00, 0x04, 0x31, 0xFF, 0x31, 0xFF, 0x31, 
-0xFF, 0x1C, 0xFF, 0x00, 0x00, 0x07, 0xFF, 0x5B, 0x00, 
-0x04, 0x31, 0xFF, 0x00, 0x00, 0x31, 0xFF, 0x31, 0xFF, 
-0x00, 0xFF, 0x31, 0xFF, 0xFF, 
-};
+  0xe2, 0x20, 0xc2, 0x10, 0xa9, 0x00, 0x48, 0xab,
+  0xad, 0x10, 0x42, 0xa2, 0x00, 0x58, 0x8e, 0x16,
+  0x21, 0xa9, 0x01, 0x8d, 0x15, 0x00, 0xa2, 0x00,
+  0xb0, 0xa9, 0x7f, 0x8e, 0x10, 0x00, 0x8d, 0x0f,
+  0x00, 0xa2, 0x00, 0x09, 0x8e, 0x13, 0x00, 0xa9,
+  0x18, 0x8d, 0x12, 0x00, 0x20, 0xdc, 0x0b, 0xa9,
+  0x01, 0x8d, 0x16, 0x00, 0x6b, 0xe2, 0x20, 0xad,
+  0x11, 0x42, 0x6b, 0xe2, 0x20, 0xc2, 0x10, 0x78,
+  0x9c, 0x00, 0x42, 0x20, 0x2a, 0x01, 0xa9, 0x01,
+  0x8d, 0x0d, 0x42, 0x20, 0x84, 0x02, 0x20, 0x93,
+  0x01, 0x20, 0x8b, 0x01, 0x20, 0x04, 0x0c, 0x20,
+  0x57, 0x02, 0xa2, 0x41, 0x00, 0xa9, 0x00, 0xca,
+  0x9f, 0x00, 0x70, 0x30, 0xd0, 0xf9, 0xa9, 0x7e,
+  0xa2, 0x1b, 0x00, 0x8d, 0x83, 0x21, 0x8e, 0x81,
+  0x21, 0xa9, 0x00, 0x8d, 0x15, 0x00, 0xa2, 0xbc,
+  0x00, 0xa9, 0xc0, 0x8e, 0x10, 0x00, 0x8d, 0x0f,
+  0x00, 0xa2, 0x6f, 0x00, 0x8e, 0x13, 0x00, 0xa9,
+  0x80, 0x8d, 0x12, 0x00, 0x20, 0xdc, 0x0b, 0xa9,
+  0x7e, 0xa2, 0x8b, 0x00, 0x8d, 0x83, 0x21, 0x8e,
+  0x81, 0x21, 0xa9, 0x00, 0x8d, 0x15, 0x00, 0xa2,
+  0x8c, 0x0b, 0xa9, 0xc0, 0x8e, 0x10, 0x00, 0x8d,
+  0x0f, 0x00, 0xa2, 0x4f, 0x00, 0x8e, 0x13, 0x00,
+  0xa9, 0x80, 0x8d, 0x12, 0x00, 0x20, 0xdc, 0x0b,
+  0x22, 0x1b, 0x00, 0x7e, 0xc2, 0x10, 0xe2, 0x20,
+  0xa9, 0x00, 0x8f, 0x00, 0x00, 0x7e, 0xa9, 0x0d,
+  0x8f, 0x02, 0x00, 0x7e, 0xa9, 0x30, 0x8f, 0x06,
+  0x00, 0x7e, 0xc2, 0x20, 0xa9, 0x00, 0x70, 0x8f,
+  0x04, 0x00, 0x7e, 0xe2, 0x20, 0xa9, 0x00, 0x8f,
+  0x07, 0x00, 0x7e, 0x20, 0x8b, 0x00, 0xc2, 0x20,
+  0xa9, 0x00, 0x58, 0x8d, 0x16, 0x21, 0xe2, 0x20,
+  0xa9, 0x01, 0x8d, 0x00, 0x43, 0xa9, 0x18, 0x8d,
+  0x01, 0x43, 0xa9, 0x7f, 0x8d, 0x04, 0x43, 0xa2,
+  0x00, 0xb0, 0x8e, 0x02, 0x43, 0xa2, 0x00, 0x09,
+  0x8e, 0x05, 0x43, 0xaf, 0x12, 0x42, 0x00, 0x29,
+  0x80, 0xd0, 0xf8, 0xaf, 0x12, 0x42, 0x00, 0x29,
+  0x80, 0xf0, 0xf8, 0xa9, 0x01, 0x8d, 0x0b, 0x42,
+  0x80, 0x9a, 0x58, 0x9c, 0x00, 0x42, 0x5c, 0x19,
+  0x00, 0x7e, 0x9c, 0x0b, 0x42, 0x9c, 0x0c, 0x42,
+  0x9c, 0x10, 0x43, 0x9c, 0x11, 0x43, 0x9c, 0x12,
+  0x43, 0x9c, 0x13, 0x43, 0x9c, 0x14, 0x43, 0x9c,
+  0x20, 0x43, 0x9c, 0x21, 0x43, 0x9c, 0x22, 0x43,
+  0x9c, 0x23, 0x43, 0x9c, 0x24, 0x43, 0x9c, 0x30,
+  0x43, 0x9c, 0x31, 0x43, 0x9c, 0x32, 0x43, 0x9c,
+  0x33, 0x43, 0x9c, 0x34, 0x43, 0x9c, 0x40, 0x43,
+  0x9c, 0x41, 0x43, 0x9c, 0x42, 0x43, 0x9c, 0x43,
+  0x43, 0x9c, 0x44, 0x43, 0x9c, 0x50, 0x43, 0x9c,
+  0x51, 0x43, 0x9c, 0x52, 0x43, 0x9c, 0x53, 0x43,
+  0x9c, 0x54, 0x43, 0x60, 0xad, 0x12, 0x42, 0x29,
+  0x80, 0xd0, 0xf9, 0xad, 0x12, 0x42, 0x29, 0x80,
+  0xf0, 0xf9, 0x60, 0xe2, 0x20, 0xc2, 0x10, 0x9c,
+  0x30, 0x21, 0x60, 0xe2, 0x20, 0xc2, 0x10, 0x9c,
+  0x00, 0x42, 0x9c, 0x0b, 0x42, 0x9c, 0x0c, 0x42,
+  0xa2, 0x00, 0xb0, 0x8e, 0x81, 0x21, 0xa9, 0x01,
+  0x8d, 0x83, 0x21, 0xa9, 0x08, 0x8d, 0x15, 0x00,
+  0xa2, 0x59, 0xff, 0xa9, 0xc0, 0x8e, 0x10, 0x00,
+  0x8d, 0x0f, 0x00, 0xa2, 0x40, 0x07, 0x8e, 0x13,
+  0x00, 0xa9, 0x80, 0x8d, 0x12, 0x00, 0x20, 0xdc,
+  0x0b, 0xa2, 0x00, 0x00, 0x8e, 0x16, 0x21, 0xa9,
+  0x01, 0x8d, 0x15, 0x00, 0xa2, 0x7c, 0x03, 0xa9,
+  0xc0, 0x8e, 0x10, 0x00, 0x8d, 0x0f, 0x00, 0xa2,
+  0x00, 0x08, 0x8e, 0x13, 0x00, 0xa9, 0x18, 0x8d,
+  0x12, 0x00, 0x20, 0xdc, 0x0b, 0xa2, 0x00, 0x58,
+  0x8e, 0x16, 0x21, 0xa9, 0x09, 0x8d, 0x15, 0x00,
+  0xa2, 0x59, 0xff, 0xa9, 0xc0, 0x8e, 0x10, 0x00,
+  0x8d, 0x0f, 0x00, 0xa2, 0x40, 0x07, 0x8e, 0x13,
+  0x00, 0xa9, 0x18, 0x8d, 0x12, 0x00, 0x20, 0xdc,
+  0x0b, 0xa2, 0x00, 0x00, 0x8e, 0x02, 0x21, 0xa9,
+  0x08, 0x8d, 0x15, 0x00, 0xa2, 0x59, 0xff, 0xa9,
+  0xc0, 0x8e, 0x10, 0x00, 0x8d, 0x0f, 0x00, 0xa2,
+  0x20, 0x02, 0x8e, 0x13, 0x00, 0xa9, 0x04, 0x8d,
+  0x12, 0x00, 0x20, 0xdc, 0x0b, 0x9c, 0x21, 0x21,
+  0xa9, 0x00, 0x8d, 0x15, 0x00, 0xa2, 0x7c, 0x0b,
+  0xa9, 0xc0, 0x8e, 0x10, 0x00, 0x8d, 0x0f, 0x00,
+  0xa2, 0x10, 0x00, 0x8e, 0x13, 0x00, 0xa9, 0x22,
+  0x8d, 0x12, 0x00, 0x20, 0xdc, 0x0b, 0x60, 0xe2,
+  0x20, 0xc2, 0x10, 0xa9, 0x00, 0x8d, 0x05, 0x21,
+  0xa9, 0x58, 0x09, 0x02, 0x8d, 0x07, 0x21, 0xa9,
+  0x40, 0x8d, 0x0b, 0x21, 0xa9, 0x01, 0x8d, 0x2c,
+  0x21, 0xa9, 0x01, 0x8d, 0x2d, 0x21, 0xa9, 0x00,
+  0x8d, 0x30, 0x21, 0x9c, 0x21, 0x21, 0xa9, 0x0f,
+  0x8d, 0x00, 0x21, 0x60, 0xe2, 0x20, 0xc2, 0x10,
+  0x9c, 0x00, 0x42, 0xa9, 0xff, 0x8d, 0x01, 0x42,
+  0x9c, 0x02, 0x42, 0x9c, 0x03, 0x42, 0x9c, 0x04,
+  0x42, 0x9c, 0x05, 0x42, 0x9c, 0x06, 0x42, 0x9c,
+  0x07, 0x42, 0x9c, 0x08, 0x42, 0x9c, 0x09, 0x42,
+  0x9c, 0x0a, 0x42, 0x9c, 0x0b, 0x42, 0x9c, 0x0c,
+  0x42, 0xa9, 0x00, 0x8d, 0x0d, 0x42, 0xa9, 0x8f,
+  0x8d, 0x00, 0x21, 0xa9, 0x03, 0x8d, 0x01, 0x21,
+  0x9c, 0x02, 0x21, 0x9c, 0x03, 0x21, 0x9c, 0x05,
+  0x21, 0x9c, 0x06, 0x21, 0x9c, 0x07, 0x21, 0x9c,
+  0x08, 0x21, 0x9c, 0x09, 0x21, 0x9c, 0x0a, 0x21,
+  0x9c, 0x0b, 0x21, 0x9c, 0x0c, 0x21, 0x9c, 0x0d,
+  0x21, 0x9c, 0x0d, 0x21, 0x9c, 0x0e, 0x21, 0x9c,
+  0x0e, 0x21, 0x9c, 0x0f, 0x21, 0x9c, 0x0f, 0x21,
+  0xa9, 0x05, 0x8d, 0x10, 0x21, 0x9c, 0x10, 0x21,
+  0x9c, 0x11, 0x21, 0x9c, 0x11, 0x21, 0x9c, 0x12,
+  0x21, 0x9c, 0x12, 0x21, 0x9c, 0x13, 0x21, 0x9c,
+  0x13, 0x21, 0x9c, 0x14, 0x21, 0x9c, 0x14, 0x21,
+  0xa9, 0x80, 0x8d, 0x15, 0x21, 0x9c, 0x16, 0x21,
+  0x9c, 0x17, 0x21, 0x9c, 0x1a, 0x21, 0x9c, 0x1b,
+  0x21, 0xa9, 0x01, 0x8d, 0x1b, 0x21, 0x9c, 0x1c,
+  0x21, 0x9c, 0x1c, 0x21, 0x9c, 0x1d, 0x21, 0x9c,
+  0x1d, 0x21, 0x9c, 0x1e, 0x21, 0x8d, 0x1e, 0x21,
+  0x9c, 0x1f, 0x21, 0x9c, 0x1f, 0x21, 0x9c, 0x20,
+  0x21, 0x9c, 0x20, 0x21, 0x9c, 0x21, 0x21, 0x9c,
+  0x23, 0x21, 0x9c, 0x24, 0x21, 0x9c, 0x25, 0x21,
+  0x9c, 0x26, 0x21, 0x9c, 0x27, 0x21, 0x9c, 0x28,
+  0x21, 0x9c, 0x29, 0x21, 0x9c, 0x2a, 0x21, 0x9c,
+  0x2b, 0x21, 0x9c, 0x2c, 0x21, 0x9c, 0x2d, 0x21,
+  0x9c, 0x2e, 0x21, 0xa9, 0x30, 0x8d, 0x30, 0x21,
+  0x9c, 0x31, 0x21, 0xa9, 0xe0, 0x8d, 0x32, 0x21,
+  0x9c, 0x33, 0x21, 0x60, 0x77, 0x00, 0x11, 0x02,
+  0x30, 0x30, 0x48, 0x30, 0x48, 0x30, 0x48, 0x20,
+  0x58, 0x00, 0x30, 0x30, 0x48, 0x00, 0x30, 0x00,
+  0x6c, 0x6c, 0x92, 0x24, 0x5a, 0x00, 0x36, 0x5b,
+  0x00, 0x09, 0x6c, 0x6c, 0x92, 0xfe, 0x01, 0x6c,
+  0x92, 0xfe, 0x01, 0x6c, 0x92, 0x00, 0x6c, 0x00,
+  0x00, 0x10, 0x6c, 0x7c, 0xc6, 0xc6, 0x39, 0xf0,
+  0x0e, 0x1e, 0xe1, 0xc6, 0x39, 0x7c, 0xc6, 0x10,
+  0x6c, 0x42, 0xa5, 0xa4, 0x5a, 0x48, 0xb4, 0x10,
+  0x6c, 0x24, 0x5a, 0x4a, 0xb5, 0x84, 0x4a, 0x00,
+  0x84, 0x70, 0xc8, 0xc0, 0x34, 0xc4, 0x2e, 0x6e,
+  0xdb, 0xc4, 0x2a, 0xc4, 0x3a, 0x7c, 0xc6, 0x00,
+  0x7c, 0x00, 0x18, 0x18, 0x24, 0x10, 0x28, 0x00,
+  0x10, 0x5b, 0x00, 0x08, 0x18, 0x24, 0x30, 0x68,
+  0x30, 0x48, 0x30, 0x48, 0x30, 0x48, 0x30, 0x68,
+  0x18, 0x24, 0x00, 0x18, 0x30, 0x48, 0x18, 0x2c,
+  0x18, 0x24, 0x18, 0x24, 0x18, 0x24, 0x18, 0x2c,
+  0x30, 0x48, 0x00, 0x30, 0x00, 0x6c, 0x6c, 0x92,
+  0x38, 0x44, 0x7c, 0x82, 0x38, 0x44, 0x6c, 0x92,
+  0x00, 0x6c, 0x00, 0x00, 0x00, 0x18, 0x18, 0x24,
+  0x18, 0x66, 0x7e, 0x81, 0x18, 0x66, 0x18, 0x24,
+  0x00, 0x18, 0x5b, 0x00, 0x0b, 0x18, 0x18, 0x24,
+  0x18, 0x24, 0x10, 0x28, 0x5b, 0x00, 0x05, 0x7e,
+  0x7e, 0x81, 0x00, 0x7e, 0x5b, 0x00, 0x0f, 0x18,
+  0x18, 0x24, 0x18, 0x24, 0x00, 0x18, 0x03, 0x04,
+  0x06, 0x09, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48,
+  0x60, 0x90, 0xc0, 0x20, 0x00, 0xc0, 0x7c, 0xc6,
+  0xe6, 0x39, 0xc6, 0x29, 0xc6, 0x29, 0xc6, 0x29,
+  0xce, 0x39, 0x7c, 0xc6, 0x00, 0x7c, 0x18, 0x34,
+  0x18, 0x24, 0x18, 0x24, 0x18, 0x24, 0x18, 0x24,
+  0x18, 0x24, 0x18, 0x24, 0x00, 0x18, 0xfc, 0x06,
+  0x06, 0xf9, 0x06, 0x79, 0x7c, 0x86, 0xc0, 0xbc,
+  0xc0, 0x3e, 0xfe, 0x01, 0x00, 0xfe, 0xfc, 0x06,
+  0x06, 0xf9, 0x06, 0x39, 0x3c, 0x46, 0x06, 0x39,
+  0x06, 0xf9, 0xfc, 0x06, 0x00, 0xfc, 0xc6, 0x29,
+  0xc6, 0x29, 0xc6, 0x39, 0x7e, 0xc1, 0x06, 0x79,
+  0x06, 0x09, 0x06, 0x09, 0x00, 0x06, 0xfe, 0x01,
+  0xc0, 0x3e, 0xc0, 0x3c, 0xfc, 0x06, 0x06, 0xf9,
+  0x06, 0xf9, 0xfc, 0x06, 0x00, 0xf8, 0x7c, 0xc2,
+  0xc0, 0x3c, 0xc0, 0x3c, 0xfc, 0x06, 0xc6, 0x39,
+  0xc6, 0x39, 0x7c, 0xc6, 0x00, 0x7c, 0xfc, 0x06,
+  0x06, 0xf9, 0x06, 0x09, 0x06, 0x09, 0x06, 0x09,
+  0x06, 0x09, 0x06, 0x09, 0x00, 0x06, 0x7c, 0xc6,
+  0xc6, 0x39, 0xc6, 0x39, 0x7c, 0xc6, 0xc6, 0x39,
+  0xc6, 0x39, 0x7c, 0xc6, 0x00, 0x7c, 0x7c, 0xc6,
+  0xc6, 0x39, 0xc6, 0x39, 0x7e, 0xc1, 0x06, 0x79,
+  0x06, 0x79, 0x7c, 0x86, 0x00, 0x7c, 0x00, 0x00,
+  0x00, 0x30, 0x30, 0x48, 0x00, 0x30, 0x00, 0x30,
+  0x30, 0x48, 0x00, 0x30, 0x5b, 0x00, 0x05, 0x30,
+  0x30, 0x48, 0x00, 0x30, 0x00, 0x30, 0x30, 0x48,
+  0x20, 0x50, 0x00, 0x20, 0x00, 0x18, 0x18, 0x24,
+  0x30, 0x48, 0x60, 0x90, 0x30, 0x48, 0x18, 0x24,
+  0x00, 0x18, 0x5b, 0x00, 0x05, 0x3c, 0x3c, 0x42,
+  0x00, 0x3c, 0x00, 0x3c, 0x3c, 0x42, 0x00, 0x3c,
+  0x00, 0x00, 0x00, 0x30, 0x30, 0x48, 0x18, 0x24,
+  0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x00, 0x30,
+  0x00, 0x00, 0xf8, 0x0c, 0x0c, 0xf2, 0x0c, 0x12,
+  0x18, 0x24, 0x30, 0x48, 0x00, 0x30, 0x30, 0x48,
+  0x00, 0x30, 0x7c, 0xc6, 0xc6, 0x39, 0xc6, 0x39,
+  0xde, 0x21, 0xde, 0x21, 0xc0, 0x3e, 0x7e, 0xc1,
+  0x00, 0x7e, 0x7c, 0xc6, 0xc6, 0x39, 0xc6, 0x39,
+  0xde, 0x21, 0xc6, 0x39, 0xc6, 0x29, 0xc6, 0x29,
+  0x00, 0xc6, 0xfc, 0x06, 0xc6, 0x39, 0xc6, 0x39,
+  0xdc, 0x26, 0xc6, 0x39, 0xc6, 0x39, 0xfc, 0x06,
+  0x00, 0xfc, 0x7e, 0xc1, 0xc0, 0x3e, 0xc0, 0x20,
+  0xc0, 0x20, 0xc0, 0x20, 0xc0, 0x3e, 0x7e, 0xc1,
+  0x00, 0x7e, 0xfc, 0x02, 0xc6, 0x3b, 0xc6, 0x29,
+  0xc6, 0x29, 0xc6, 0x29, 0xc6, 0x3b, 0xfc, 0x02,
+  0x00, 0xfc, 0xfe, 0x01, 0xc0, 0x3e, 0xc0, 0x38,
+  0xf8, 0x04, 0xc0, 0x38, 0xc0, 0x3e, 0xfe, 0x01,
+  0x00, 0xfe, 0xfe, 0x01, 0xc0, 0x3e, 0xc0, 0x38,
+  0xf8, 0x04, 0xc0, 0x38, 0xc0, 0x20, 0xc0, 0x20,
+  0x00, 0xc0, 0x7e, 0xc1, 0xc0, 0x3e, 0xc0, 0x2e,
+  0xce, 0x33, 0xc6, 0x29, 0xc6, 0x39, 0x7c, 0xc6,
+  0x00, 0x7c, 0xc6, 0x29, 0xc6, 0x29, 0xc6, 0x39,
+  0xfe, 0x01, 0xc6, 0x39, 0xc6, 0x29, 0xc6, 0x29,
+  0x00, 0xc6, 0x18, 0x24, 0x18, 0x24, 0x18, 0x24,
+  0x18, 0x24, 0x18, 0x24, 0x18, 0x24, 0x18, 0x24,
+  0x00, 0x18, 0x0c, 0x12, 0x0c, 0x12, 0x0c, 0x12,
+  0x0c, 0x12, 0x0c, 0x12, 0x0c, 0xf6, 0xf8, 0x06,
+  0x00, 0xfc, 0xc6, 0x29, 0xc6, 0x29, 0xc6, 0x38,
+  0xfc, 0x06, 0xc6, 0x39, 0xc6, 0x29, 0xc6, 0x29,
+  0x00, 0xc7, 0xc0, 0x20, 0xc0, 0x20, 0xc0, 0x20,
+  0xc0, 0x20, 0xc0, 0x20, 0xc0, 0x3c, 0xfc, 0x02,
+  0x00, 0xfc, 0xec, 0x16, 0xd6, 0x29, 0xd6, 0x29,
+  0xd6, 0x29, 0xc6, 0x39, 0xc6, 0x29, 0xc6, 0x29,
+  0x00, 0xc7, 0xfc, 0x06, 0xc6, 0x39, 0xc6, 0x29,
+  0xc6, 0x29, 0xc6, 0x29, 0xc6, 0x29, 0xc6, 0x29,
+  0x00, 0xc6, 0x7c, 0xc6, 0xc6, 0x39, 0xc6, 0x29,
+  0xc6, 0x29, 0xc6, 0x29, 0xc6, 0x39, 0x7c, 0xc6,
+  0x00, 0x7c, 0xfc, 0x06, 0xc6, 0x39, 0xc6, 0x29,
+  0xc6, 0x39, 0xfc, 0x06, 0xc0, 0x3c, 0xc0, 0x20,
+  0x00, 0xc0, 0x7c, 0x82, 0xc6, 0xbb, 0xc6, 0x29,
+  0xc6, 0x29, 0xc6, 0x29, 0xce, 0x31, 0x7e, 0xc1,
+  0x00, 0x7e, 0xfc, 0x06, 0xc6, 0x39, 0xc6, 0x39,
+  0xfc, 0x06, 0xc6, 0x39, 0xc6, 0x29, 0xc6, 0x29,
+  0x00, 0xc6, 0x7e, 0xc1, 0xc0, 0x3e, 0xc0, 0x3c,
+  0x7c, 0xc6, 0x06, 0x79, 0x06, 0xf9, 0xfc, 0x06,
+  0x00, 0xfc, 0xfe, 0x01, 0x18, 0xe6, 0x18, 0x24,
+  0x18, 0x24, 0x18, 0x24, 0x18, 0x24, 0x18, 0x24,
+  0x00, 0x18, 0xc6, 0x29, 0xc6, 0x29, 0xc6, 0x29,
+  0xc6, 0x29, 0xc6, 0x29, 0xc6, 0x39, 0x7c, 0xc6,
+  0x00, 0x7c, 0xc6, 0x29, 0xc6, 0x29, 0xc6, 0x29,
+  0xc6, 0x29, 0x66, 0x99, 0x36, 0x49, 0x1e, 0x21,
+  0x00, 0x1f, 0xc6, 0x29, 0xc6, 0x29, 0xc6, 0x39,
+  0xd6, 0x29, 0xd6, 0x29, 0xd6, 0x29, 0x6e, 0xd1,
+  0x00, 0x6e, 0xc6, 0x29, 0xc6, 0x29, 0xc6, 0x39,
+  0x7c, 0xc6, 0xc6, 0x39, 0xc6, 0x29, 0xc6, 0x29,
+  0x00, 0xc6, 0xc6, 0x29, 0xc6, 0x29, 0xc6, 0x39,
+  0x7e, 0xc1, 0x06, 0x79, 0x06, 0xf9, 0xfc, 0x06,
+  0x00, 0xfc, 0xfe, 0x01, 0x06, 0xf9, 0x06, 0x79,
+  0x7c, 0xc6, 0xc0, 0x3c, 0xc0, 0x3e, 0xfe, 0x01,
+  0x00, 0xfe, 0x3c, 0x42, 0x30, 0x4c, 0x30, 0x48,
+  0x30, 0x48, 0x30, 0x48, 0x30, 0x4c, 0x3c, 0x42,
+  0x00, 0x3c, 0xc0, 0x20, 0x60, 0x90, 0x30, 0x48,
+  0x18, 0x24, 0x0c, 0x12, 0x06, 0x09, 0x03, 0x04,
+  0x00, 0x03, 0x3c, 0x42, 0x0c, 0x32, 0x0c, 0x12,
+  0x0c, 0x12, 0x0c, 0x12, 0x0c, 0x32, 0x3c, 0x42,
+  0x00, 0x3c, 0x18, 0x24, 0x3c, 0x66, 0x66, 0x99,
+  0x00, 0x66, 0x5b, 0x00, 0x13, 0x7e, 0x7e, 0x81,
+  0x00, 0x7e, 0x30, 0x48, 0x18, 0x24, 0x18, 0x24,
+  0x00, 0x18, 0x5b, 0x00, 0x0b, 0x7c, 0x7c, 0x86,
+  0x06, 0x79, 0x7e, 0xc1, 0xc6, 0x39, 0x7e, 0xc1,
+  0x00, 0x7e, 0xc0, 0x20, 0xc0, 0x3c, 0xfc, 0x06,
+  0xc6, 0x39, 0xc6, 0x29, 0xc6, 0x39, 0xfc, 0x06,
+  0x00, 0xfc, 0x00, 0x00, 0x00, 0x7e, 0x7e, 0xc1,
+  0xc0, 0x3e, 0xc0, 0x20, 0xc0, 0x3e, 0x7e, 0xc1,
+  0x00, 0x7e, 0x06, 0x09, 0x06, 0x79, 0x7e, 0xc1,
+  0xc6, 0x39, 0xc6, 0x29, 0xc6, 0x39, 0x7e, 0xc1,
+  0x00, 0x7f, 0x00, 0x00, 0x00, 0x7c, 0x7c, 0xc6,
+  0xc6, 0x39, 0xfe, 0x01, 0xc0, 0x3e, 0x7e, 0xc3,
+  0x00, 0x7e, 0x1e, 0x21, 0x30, 0x6e, 0x30, 0x4c,
+  0x3c, 0x42, 0x30, 0x4c, 0x30, 0x48, 0x30, 0x48,
+  0x30, 0x48, 0x00, 0x00, 0x00, 0x7e, 0x7e, 0xc1,
+  0xc6, 0x39, 0xc6, 0x39, 0x7e, 0xc1, 0x06, 0x79,
+  0x7c, 0x86, 0xc0, 0x20, 0xc0, 0x3c, 0xfc, 0x06,
+  0xc6, 0x39, 0xc6, 0x29, 0xc6, 0x29, 0xc6, 0x29,
+  0x00, 0xc6, 0x00, 0x18, 0x18, 0x24, 0x00, 0x18,
+  0x18, 0x24, 0x18, 0x24, 0x18, 0x24, 0x18, 0x24,
+  0x00, 0x18, 0x00, 0x18, 0x18, 0x24, 0x00, 0x18,
+  0x18, 0x24, 0x18, 0x24, 0x18, 0x24, 0x18, 0x2c,
+  0x30, 0x48, 0xc0, 0x20, 0xc0, 0x26, 0xc6, 0x29,
+  0xc6, 0x2b, 0xfc, 0x06, 0xc6, 0x2b, 0xc6, 0x29,
+  0x00, 0xc7, 0x30, 0x48, 0x30, 0x48, 0x30, 0x48,
+  0x30, 0x48, 0x30, 0x48, 0x30, 0x68, 0x18, 0x24,
+  0x00, 0x1c, 0x00, 0x00, 0x00, 0xec, 0xec, 0x16,
+  0xd6, 0x29, 0xd6, 0x29, 0xd6, 0x29, 0xc6, 0x39,
+  0x00, 0xc7, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x06,
+  0xc6, 0x39, 0xc6, 0x29, 0xc6, 0x29, 0xc6, 0x29,
+  0x00, 0xc6, 0x00, 0x00, 0x00, 0x7c, 0x7c, 0xc6,
+  0xc6, 0x39, 0xc6, 0x29, 0xc6, 0x39, 0x7c, 0xc6,
+  0x00, 0x7c, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x06,
+  0xc6, 0x39, 0xc6, 0x39, 0xfc, 0x06, 0xc0, 0x3c,
+  0xc0, 0x20, 0x00, 0x00, 0x00, 0x7e, 0x7e, 0xc1,
+  0xc6, 0x39, 0xc6, 0x39, 0x7e, 0xc1, 0x06, 0x79,
+  0x06, 0x09, 0x00, 0x00, 0x00, 0x7c, 0x7c, 0xc2,
+  0xc0, 0x3c, 0xc0, 0x20, 0xc0, 0x20, 0xc0, 0x20,
+  0x00, 0xc0, 0x00, 0x00, 0x00, 0x7e, 0x7e, 0xc1,
+  0xc0, 0x3e, 0x7c, 0xc6, 0x06, 0xf9, 0xfc, 0x06,
+  0x00, 0xfc, 0x30, 0x48, 0x30, 0x4c, 0x3c, 0x42,
+  0x30, 0x4c, 0x30, 0x48, 0x30, 0x4e, 0x1e, 0x31,
+  0x00, 0x1e, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0x29,
+  0xc6, 0x29, 0xc6, 0x29, 0xc6, 0x39, 0x7c, 0xc6,
+  0x00, 0x7c, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0x29,
+  0xc6, 0x29, 0x66, 0x99, 0x36, 0x49, 0x1e, 0x21,
+  0x00, 0x1e, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0x39,
+  0xd6, 0x29, 0xd6, 0x29, 0xd6, 0x29, 0x6e, 0xd1,
+  0x00, 0x6e, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0x29,
+  0xc6, 0x39, 0x7c, 0xc6, 0xc6, 0x39, 0xc6, 0x29,
+  0x00, 0xc6, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0x29,
+  0xc6, 0x39, 0x7e, 0xc1, 0x06, 0x79, 0x06, 0xf9,
+  0xfc, 0x06, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0x01,
+  0x06, 0xf9, 0x7c, 0xc6, 0xc0, 0x3e, 0xfe, 0x01,
+  0x00, 0xfe, 0x18, 0x24, 0x30, 0x48, 0x30, 0x48,
+  0x70, 0x88, 0x30, 0x48, 0x30, 0x48, 0x18, 0x24,
+  0x00, 0x18, 0x18, 0x24, 0x18, 0x24, 0x18, 0x24,
+  0x00, 0x18, 0x18, 0x24, 0x18, 0x24, 0x18, 0x24,
+  0x00, 0x18, 0x30, 0x48, 0x18, 0x24, 0x18, 0x24,
+  0x1c, 0x22, 0x18, 0x24, 0x18, 0x24, 0x30, 0x48,
+  0x00, 0x30, 0x00, 0x00, 0x00, 0x72, 0x72, 0x9d,
+  0xfe, 0x01, 0x9c, 0x72, 0x00, 0x9c, 0x5b, 0x00,
+  0x14, 0x42, 0x08, 0xff, 0x7f, 0x00, 0x00, 0x9c,
+  0x73, 0x42, 0x08, 0xff, 0x43, 0x00, 0x00, 0x18,
+  0x63, 0xc2, 0x30, 0xad, 0x00, 0x00, 0x29, 0xff,
+  0x00, 0x0a, 0x18, 0x69, 0x00, 0xb0, 0x8d, 0x09,
+  0x00, 0xad, 0x02, 0x00, 0x29, 0xff, 0x00, 0x5b,
+  0x0a, 0x06, 0x18, 0x6d, 0x09, 0x00, 0x8f, 0x81,
+  0x21, 0x00, 0xe2, 0x20, 0xa9, 0x7f, 0x8f, 0x83,
+  0x21, 0x00, 0xae, 0x04, 0x00, 0xad, 0x06, 0x00,
+  0x48, 0xab, 0xbd, 0x00, 0x00, 0xf0, 0x11, 0x8f,
+  0x80, 0x21, 0x00, 0xa9, 0x00, 0x69, 0x00, 0x09,
+  0x20, 0x8f, 0x80, 0x21, 0x00, 0xe8, 0x80, 0xea,
+  0xa9, 0x00, 0x48, 0xab, 0x60, 0xff, 0xc2, 0x10,
+  0xe2, 0x20, 0xad, 0x15, 0x00, 0x8d, 0x00, 0x43,
+  0xad, 0x12, 0x00, 0x8d, 0x01, 0x43, 0xad, 0x0f,
+  0x00, 0xae, 0x10, 0x00, 0x8e, 0x02, 0x43, 0x8d,
+  0x04, 0x43, 0xae, 0x13, 0x00, 0x8e, 0x05, 0x43,
+  0xa9, 0x01, 0x8d, 0x0b, 0x42, 0x60, 0xe2, 0x20,
+  0xc2, 0x10, 0x9c, 0x0b, 0x42, 0x9c, 0x0c, 0x42,
+  0x9c, 0x00, 0x42, 0x60, 0x77, 0x00, 0xee, 0xf2,
+  0x78, 0x18, 0xfb, 0x5c, 0x3b, 0x00, 0xc0, 0x08,
+  0xc2, 0x30, 0x48, 0xda, 0x5a, 0x0b, 0x8b, 0x22,
+  0x35, 0x00, 0xc0, 0xc2, 0x30, 0xab, 0x2b, 0x7a,
+  0xfa, 0x68, 0x28, 0x40, 0x08, 0xc2, 0x30, 0x48,
+  0xda, 0x5a, 0x0b, 0x8b, 0x22, 0x00, 0x00, 0xc0,
+  0xc2, 0x30, 0xab, 0x2b, 0x7a, 0xfa, 0x68, 0x28,
+  0x40, 0xcb, 0xaf, 0xef, 0xcd, 0xab, 0x80, 0xf9,
+  0x5b, 0x20, 0x1c, 0x76, 0x30, 0x2e, 0x31, 0x00,
+  0x00, 0x00, 0x5b, 0x20, 0x41, 0x00, 0x20, 0x3c,
+  0x64, 0x69, 0x72, 0x3e, 0x5b, 0x00, 0x0d, 0x4d,
+  0x52, 0x42, 0x4f, 0x4f, 0x54, 0x5b, 0x00, 0x0a,
+  0x53, 0x44, 0x32, 0x53, 0x4e, 0x45, 0x53, 0x20,
+  0x42, 0x4f, 0x4f, 0x54, 0x5b, 0x20, 0x09, 0x31,
+  0x02, 0x06, 0x03, 0x09, 0x33, 0x00, 0x4f, 0x87,
+  0xb0, 0x78, 0x5b, 0x00, 0x04, 0x31, 0xff, 0x31,
+  0xff, 0x31, 0xff, 0x1c, 0xff, 0x00, 0x00, 0x07,
+  0xff, 0x5b, 0x00, 0x04, 0x31, 0xff, 0x00, 0x00,
+  0x31, 0xff, 0x31, 0xff, 0x00, 0xff, 0x31, 0xff};
--- a/src/sort.c
+++ b/src/sort.c
@ -15,155 +15,112 @@
 */

 uint32_t stat_getstring = 0;
-static char sort_str1[SORT_STRLEN + 1], sort_str2[SORT_STRLEN + 1];
+static char sort_str1[SORT_STRLEN+1], sort_str2[SORT_STRLEN+1];
 uint32_t ptrcache[QSORT_MAXELEM] IN_AHBRAM;

 /* get element from pointer table in external RAM*/
-uint32_t sort_get_elem( uint32_t base, unsigned int index )
-{
-    return sram_readlong( base + 4 * index );
+uint32_t sort_get_elem(uint32_t base, unsigned int index) {
+  return sram_readlong(base+4*index);
 }

 /* put element from pointer table in external RAM */
-void sort_put_elem( uint32_t base, unsigned int index, uint32_t elem )
-{
-    sram_writelong( elem, base + 4 * index );
+void sort_put_elem(uint32_t base, unsigned int index, uint32_t elem) {
+  sram_writelong(elem, base+4*index);
 }

 /* compare strings pointed to by elements of pointer table */
-int sort_cmp_idx( uint32_t base, unsigned int index1, unsigned int index2 )
-{
+int sort_cmp_idx(uint32_t base, unsigned int index1, unsigned int index2) {
  uint32_t elem1, elem2;
-    elem1 = sort_get_elem( base, index1 );
-    elem2 = sort_get_elem( base, index2 );
-    return sort_cmp_elem( ( void * )&elem1, ( void * )&elem2 );
+  elem1 = sort_get_elem(base, index1);
+  elem2 = sort_get_elem(base, index2);
+  return sort_cmp_elem((void*)&elem1, (void*)&elem2);
 }

-int sort_cmp_elem( const void *elem1, const void *elem2 )
-{
-    uint32_t el1 = *( uint32_t * )elem1;
-    uint32_t el2 = *( uint32_t * )elem2;
-    sort_getstring_for_dirent( sort_str1, el1 );
-    sort_getstring_for_dirent( sort_str2, el2 );
-    /*printf("i1=%d i2=%d elem1=%lx elem2=%lx ; compare %s   ---   %s\n", index1, index2, elem1, elem2, sort_str1, sort_str2); */
+int sort_cmp_elem(const void* elem1, const void* elem2) {
+  uint32_t el1 = *(uint32_t*)elem1;
+  uint32_t el2 = *(uint32_t*)elem2;
+  sort_getstring_for_dirent(sort_str1, el1);
+  sort_getstring_for_dirent(sort_str2, el2);
+/*printf("i1=%d i2=%d elem1=%lx elem2=%lx ; compare %s   ---   %s\n", index1, index2, elem1, elem2, sort_str1, sort_str2); */

-    if ( ( el1 & 0x80000000 ) && !( el2 & 0x80000000 ) )
-    {
+  if ((el1 & 0x80000000) && !(el2 & 0x80000000)) {
    return -1;
  }

-    if ( !( el1 & 0x80000000 ) && ( el2 & 0x80000000 ) )
-    {
+  if (!(el1 & 0x80000000) && (el2 & 0x80000000)) {
    return 1;
  }

-    if ( *sort_str1 == '.' )
-    {
-        return -1;
-    }
-
-    if ( *sort_str2 == '.' )
-    {
-        return 1;
-    }
+  if (*sort_str1 == '.') return -1;
+  if (*sort_str2 == '.') return 1;

  /* Do not compare trailing slashes of directory names */
-    if ( ( el1 & 0x80000000 ) && ( el2 & 0x80000000 ) )
-    {
-        char *str1_slash = strrchr( sort_str1, '/' );
-        char *str2_slash = strrchr( sort_str2, '/' );
-
-        if ( str1_slash != NULL )
-        {
-            *str1_slash = 0;
+  if ((el1 & 0x80000000) && (el2 & 0x80000000)) {
+    char *str1_slash = strrchr(sort_str1, '/');
+    char *str2_slash = strrchr(sort_str2, '/');
+    if(str1_slash != NULL) *str1_slash = 0;
+    if(str2_slash != NULL) *str2_slash = 0;
  }

-        if ( str2_slash != NULL )
-        {
-            *str2_slash = 0;
-        }
-    }
-
-    return strcasecmp( sort_str1, sort_str2 );
+  return strcasecmp(sort_str1, sort_str2);
 }

 /* get truncated string from database */
-void sort_getstring_for_dirent( char *ptr, uint32_t addr )
-{
+void sort_getstring_for_dirent(char *ptr, uint32_t addr) {
  uint8_t leaf_offset;
-
-    if ( addr & 0x80000000 )
-    {
+  if(addr & 0x80000000) {
    /* is directory link, name offset 4 */
-        leaf_offset = sram_readbyte( addr + 4 + SRAM_MENU_ADDR );
-        sram_readstrn( ptr, addr + 5 + leaf_offset + SRAM_MENU_ADDR, SORT_STRLEN );
-    }
-    else
-    {
+    leaf_offset = sram_readbyte(addr + 4 + SRAM_MENU_ADDR);
+    sram_readstrn(ptr, addr + 5 + leaf_offset + SRAM_MENU_ADDR, SORT_STRLEN);
+  } else {
    /* is file link, name offset 6 */
-        leaf_offset = sram_readbyte( addr + 6 + SRAM_MENU_ADDR );
-        sram_readstrn( ptr, addr + 7 + leaf_offset + SRAM_MENU_ADDR, SORT_STRLEN );
+    leaf_offset = sram_readbyte(addr + 6 + SRAM_MENU_ADDR);
+    sram_readstrn(ptr, addr + 7 + leaf_offset + SRAM_MENU_ADDR, SORT_STRLEN);
  }
 }

-void sort_heapify( uint32_t addr, unsigned int i, unsigned int heapsize )
+void sort_heapify(uint32_t addr, unsigned int i, unsigned int heapsize)
 {
-    while ( 1 )
-    {
-        unsigned int l = 2 * i + 1;
-        unsigned int r = 2 * i + 2;
-        unsigned int largest = ( l < heapsize && sort_cmp_idx( addr, i, l ) < 0 ) ? l : i;
+  while(1) {
+    unsigned int l = 2*i+1;
+    unsigned int r = 2*i+2;
+    unsigned int largest = (l < heapsize && sort_cmp_idx(addr, i, l) < 0) ? l : i;

-        if ( r < heapsize && sort_cmp_idx( addr, largest, r ) < 0 )
-        {
+    if(r < heapsize && sort_cmp_idx(addr, largest, r) < 0)
      largest = r;
-        }

-        if ( largest != i )
-        {
-            uint32_t tmp = sort_get_elem( addr, i );
-            sort_put_elem( addr, i, sort_get_elem( addr, largest ) );
-            sort_put_elem( addr, largest, tmp );
+    if(largest != i) {
+      uint32_t tmp = sort_get_elem(addr, i);
+      sort_put_elem(addr, i, sort_get_elem(addr, largest));
+      sort_put_elem(addr, largest, tmp);
      i = largest;
    }
-        else
-        {
-            break;
-        }
+    else break;
  }
 }

-void sort_dir( uint32_t addr, unsigned int size )
+void sort_dir(uint32_t addr, unsigned int size)
 {
-    stat_getstring = 0;
-
-    if ( size > QSORT_MAXELEM )
-    {
-        printf( "more than %d dir entries, doing slower in-place sort\n", QSORT_MAXELEM );
-        ext_heapsort( addr, size );
-    }
-    else
-    {
+stat_getstring=0;
+  if(size > QSORT_MAXELEM) {
+    printf("more than %d dir entries, doing slower in-place sort\n", QSORT_MAXELEM);
+    ext_heapsort(addr, size);
+  } else {
    /* retrieve, sort, and store dir table */
-        sram_readblock( ptrcache, addr, size * 4 );
-        qsort( ( void * )ptrcache, size, 4, sort_cmp_elem );
-        sram_writeblock( ptrcache, addr, size * 4 );
+    sram_readblock(ptrcache, addr, size*4);
+    qsort((void*)ptrcache, size, 4, sort_cmp_elem);
+    sram_writeblock(ptrcache, addr, size*4);
  }
 }

-void ext_heapsort( uint32_t addr, unsigned int size )
-{
-    for ( unsigned int i = size / 2; i > 0; )
-    {
-        sort_heapify( addr, --i, size );
-    }
+void ext_heapsort(uint32_t addr, unsigned int size) {
+  for(unsigned int i = size/2; i > 0;) sort_heapify(addr, --i, size);

-    for ( unsigned int i = size - 1; i > 0; --i )
-    {
-        uint32_t tmp = sort_get_elem( addr, 0 );
-        sort_put_elem( addr, 0, sort_get_elem( addr, i ) );
-        sort_put_elem( addr, i, tmp );
-        sort_heapify( addr, 0, i );
+  for(unsigned int i = size-1; i>0; --i) {
+    uint32_t tmp = sort_get_elem(addr, 0);
+    sort_put_elem(addr, 0, sort_get_elem(addr, i));
+    sort_put_elem(addr, i, tmp);
+    sort_heapify(addr, 0, i);
  }
 }

--- a/src/sort.h
+++ b/src/sort.h
@ -3,13 +3,13 @@

 #include <arm/NXP/LPC17xx/LPC17xx.h>

-uint32_t sort_get_elem( uint32_t base, unsigned int index );
-void sort_put_elem( uint32_t base, unsigned int index, uint32_t elem );
-int sort_cmp_idx( uint32_t base, unsigned int index1, unsigned int index2 );
-int sort_cmp_elem( const void *elem1, const void *elem2 );
-void sort_getstring_for_dirent( char *ptr, uint32_t addr );
-void sort_getlong_for_dirent( uint32_t *ptr, uint32_t addr );
-void sort_heapify( uint32_t addr, unsigned int i, unsigned int heapsize );
-void sort_dir( uint32_t addr, unsigned int size );
-void ext_heapsort( uint32_t addr, unsigned int size );
+uint32_t sort_get_elem(uint32_t base, unsigned int index);
+void sort_put_elem(uint32_t base, unsigned int index, uint32_t elem);
+int sort_cmp_idx(uint32_t base, unsigned int index1, unsigned int index2);
+int sort_cmp_elem(const void* elem1, const void* elem2);
+void sort_getstring_for_dirent(char *ptr, uint32_t addr);
+void sort_getlong_for_dirent(uint32_t* ptr, uint32_t addr);
+void sort_heapify(uint32_t addr, unsigned int i, unsigned int heapsize);
+void sort_dir(uint32_t addr, unsigned int size);
+void ext_heapsort(uint32_t addr, unsigned int size);
 #endif
--- a/src/spi.c
+++ b/src/spi.c
@ -30,156 +30,136 @@
 #include "spi.h"
 #include "uart.h"

-void spi_preinit()
-{
+void spi_preinit() {
+
  /* Set clock prescaler to 1:1 */
-    BITBAND( LPC_SC->SSP_PCLKREG, SSP_PCLKBIT ) = 1;
+  BITBAND(LPC_SC->SSP_PCLKREG, SSP_PCLKBIT) = 1;
 }

-void spi_init()
-{
+void spi_init() {

  /* configure data format - 8 bits, SPI, CPOL=0, CPHA=0, 1 clock per bit */
-    SSP_REGS->CR0 = ( 8 - 1 );
+  SSP_REGS->CR0 = (8-1);

  /* set clock prescaler */
  SSP_REGS->CPSR = SSP_CLK_DIVISOR;

  /* Enable SSP */
-    SSP_REGS->CR1 = BV( 1 );
+  SSP_REGS->CR1 = BV(1);

  /* Enable DMA controller, little-endian mode */
-    BITBAND( LPC_SC->PCONP, 29 ) = 1;
+  BITBAND(LPC_SC->PCONP, 29) = 1;
  LPC_GPDMA->DMACConfig = 1;
 }

-void spi_tx_sync()
-{
+void spi_tx_sync() {
  /* Wait until TX fifo is flushed */
-    while ( BITBAND( SSP_REGS->SR, SSP_BSY ) ) ;
+  while (BITBAND(SSP_REGS->SR, SSP_BSY)) ;
 }

-void spi_tx_byte( uint8_t data )
-{
+void spi_tx_byte(uint8_t data) {
  /* Wait until TX fifo can accept data */
-    while ( !BITBAND( SSP_REGS->SR, SSP_TNF ) ) ;
+  while (!BITBAND(SSP_REGS->SR, SSP_TNF)) ;

  /* Send byte */
  SSP_REGS->DR = data;
 }

-uint8_t spi_txrx_byte( uint8_t data )
-{
+uint8_t spi_txrx_byte(uint8_t data) {
  /* Wait until SSP is not busy */
-    while ( BITBAND( SSP_REGS->SR, SSP_BSY ) ) ;
+  while (BITBAND(SSP_REGS->SR, SSP_BSY)) ;

  /* Clear RX fifo */
-    while ( BITBAND( SSP_REGS->SR, SSP_RNE ) )
-    {
-        ( void ) SSP_REGS->DR;
-    }
+  while (BITBAND(SSP_REGS->SR, SSP_RNE))
+    (void) SSP_REGS->DR;

  /* Transmit a single byte */
  SSP_REGS->DR = data;

  /* Wait until answer has been received */
-    while ( !BITBAND( SSP_REGS->SR, SSP_RNE ) ) ;
+  while (!BITBAND(SSP_REGS->SR, SSP_RNE)) ;

  return SSP_REGS->DR;
 }

-uint8_t spi_rx_byte()
-{
+uint8_t spi_rx_byte() {
  /* Wait until SSP is not busy */
-    while ( BITBAND( SSP_REGS->SR, SSP_BSY ) ) ;
+  while (BITBAND(SSP_REGS->SR, SSP_BSY)) ;

  /* Clear RX fifo */
-    while ( BITBAND( SSP_REGS->SR, SSP_RNE ) )
-    {
-        ( void ) SSP_REGS->DR;
-    }
+  while (BITBAND(SSP_REGS->SR, SSP_RNE))
+    (void) SSP_REGS->DR;

  /* Transmit a single dummy byte */
  SSP_REGS->DR = 0xff;

  /* Wait until answer has been received */
-    while ( !BITBAND( SSP_REGS->SR, SSP_RNE ) ) ;
+  while (!BITBAND(SSP_REGS->SR, SSP_RNE)) ;

  return SSP_REGS->DR;
 }

-void spi_tx_block( const void *ptr, unsigned int length )
-{
-    const uint8_t *data = ( const uint8_t * )ptr;
+void spi_tx_block(const void *ptr, unsigned int length) {
+  const uint8_t *data = (const uint8_t *)ptr;

-    while ( length-- )
-    {
+  while (length--) {
  /* Wait until TX fifo can accept data */
-        while ( !BITBAND( SSP_REGS->SR, SSP_TNF ) ) ;
+    while (!BITBAND(SSP_REGS->SR, SSP_TNF)) ;

    SSP_REGS->DR = *data++;
  }
 }

-void spi_rx_block( void *ptr, unsigned int length )
-{
-    uint8_t *data = ( uint8_t * )ptr;
+void spi_rx_block(void *ptr, unsigned int length) {
+  uint8_t *data = (uint8_t *)ptr;
  unsigned int txlen = length;

  /* Wait until SSP is not busy */
-    while ( BITBAND( SSP_REGS->SR, SSP_BSY ) ) ;
+  while (BITBAND(SSP_REGS->SR, SSP_BSY)) ;

  /* Clear RX fifo */
-    while ( BITBAND( SSP_REGS->SR, SSP_RNE ) )
-    {
-        ( void ) SSP_REGS->DR;
-    }
+  while (BITBAND(SSP_REGS->SR, SSP_RNE))
+    (void) SSP_REGS->DR;

-    if ( ( length & 3 ) != 0 || ( ( uint32_t )ptr & 3 ) != 0 )
-    {
+  if ((length & 3) != 0 || ((uint32_t)ptr & 3) != 0) {
    /* Odd length or unaligned buffer */
-        while ( length > 0 )
-        {
+    while (length > 0) {
      /* Wait until TX or RX FIFO are ready */
-            while ( txlen > 0 && !BITBAND( SSP_REGS->SR, SSP_TNF ) &&
-                    !BITBAND( SSP_REGS->SR, SSP_RNE ) ) ;
+      while (txlen > 0 && !BITBAND(SSP_REGS->SR, SSP_TNF) &&
+             !BITBAND(SSP_REGS->SR, SSP_RNE)) ;

      /* Try to receive data */
-            while ( length > 0 && BITBAND( SSP_REGS->SR, SSP_RNE ) )
-            {
+      while (length > 0 && BITBAND(SSP_REGS->SR, SSP_RNE)) {
        *data++ = SSP_REGS->DR;
        length--;
      }

      /* Send dummy data until TX full or RX ready */
-            while ( txlen > 0 && BITBAND( SSP_REGS->SR, SSP_TNF ) && !BITBAND( SSP_REGS->SR, SSP_RNE ) )
-            {
+      while (txlen > 0 && BITBAND(SSP_REGS->SR, SSP_TNF) && !BITBAND(SSP_REGS->SR, SSP_RNE)) {
        txlen--;
        SSP_REGS->DR = 0xff;
      }
    }
-    }
-    else
-    {
+  } else {
    /* Clear interrupt flags of DMA channels 0 */
-        LPC_GPDMA->DMACIntTCClear = BV( 0 );
-        LPC_GPDMA->DMACIntErrClr  = BV( 0 );
+    LPC_GPDMA->DMACIntTCClear = BV(0);
+    LPC_GPDMA->DMACIntErrClr  = BV(0);

    /* Set up RX DMA channel */
-        SSP_DMACH->DMACCSrcAddr  = ( uint32_t )&SSP_REGS->DR;
-        SSP_DMACH->DMACCDestAddr = ( uint32_t )ptr;
+    SSP_DMACH->DMACCSrcAddr  = (uint32_t)&SSP_REGS->DR;
+    SSP_DMACH->DMACCDestAddr = (uint32_t)ptr;
    SSP_DMACH->DMACCLLI      = 0; // no linked list
    SSP_DMACH->DMACCControl  = length
-                                   | ( 0 << 12 ) // source burst size 1 (FIXME: Check if larger possible/useful)
-                                   | ( 0 << 15 ) // destination burst size 1
-                                   | ( 0 << 18 ) // source transfer width 1 byte
-                                   | ( 2 << 21 ) // destination transfer width 4 bytes
-                                   | ( 0 << 26 ) // source address not incremented
-                                   | ( 1 << 27 ) // destination address incremented
+      | (0 << 12) // source burst size 1 (FIXME: Check if larger possible/useful)
+      | (0 << 15) // destination burst size 1
+      | (0 << 18) // source transfer width 1 byte
+      | (2 << 21) // destination transfer width 4 bytes
+      | (0 << 26) // source address not incremented
+      | (1 << 27) // destination address incremented
      ;
    SSP_DMACH->DMACCConfig = 1 // enable channel
-                                 | ( SSP_DMAID_RX << 1 ) // data source SSP RX
-                                 | ( 2 << 11 ) // transfer from peripheral to memory
+      | (SSP_DMAID_RX << 1) // data source SSP RX
+      | (2 << 11) // transfer from peripheral to memory
      ;

    /* Enable RX FIFO DMA */
@ -187,17 +167,15 @@ void spi_rx_block( void *ptr, unsigned int length )

    /* Write <length> bytes into TX FIFO */
    // FIXME: Any value in doing this using DMA too?
-        while ( txlen > 0 )
-        {
-            while ( txlen > 0 && BITBAND( SSP_REGS->SR, SSP_TNF ) )
-            {
+    while (txlen > 0) {
+      while (txlen > 0 && BITBAND(SSP_REGS->SR, SSP_TNF)) {
        txlen--;
        SSP_REGS->DR = 0xff;
      }
    }

    /* Wait until DMA channel disables itself */
-        while ( SSP_DMACH->DMACCConfig & 1 ) ;
+    while (SSP_DMACH->DMACCConfig & 1) ;

    /* Disable RX FIFO DMA */
    SSP_REGS->DMACR = 0;
--- a/src/spi.h
+++ b/src/spi.h
@ -39,27 +39,27 @@
 typedef enum { SPI_SPEED_FAST, SPI_SPEED_SLOW, SPI_SPEED_FPGA_FAST, SPI_SPEED_FPGA_SLOW } spi_speed_t;

 /* Pre-Initialize SPI interface (PCLK divider before PLL setup) */
-void spi_preinit( void );
+void spi_preinit(void);

 /* Initialize SPI interface */
-void spi_init( void );
+void spi_init(void);

 /* Transmit a single byte */
-void spi_tx_byte( uint8_t data );
+void spi_tx_byte(uint8_t data);

 /* Transmit a single byte and return received data */
-uint8_t spi_txrx_byte( uint8_t data );
+uint8_t spi_txrx_byte(uint8_t data);

 /* Transmit a data block */
-void spi_tx_block( const void *data, unsigned int length );
+void spi_tx_block(const void *data, unsigned int length);

 /* Receive a single byte */
-uint8_t spi_rx_byte( void );
+uint8_t spi_rx_byte(void);

 /* Receive a data block */
-void spi_rx_block( void *data, unsigned int length );
+void spi_rx_block(void *data, unsigned int length);

 /* wait for SPI TX FIFO to become empty */
-void spi_tx_sync( void );
+void spi_tx_sync(void);

 #endif
--- a/src/sysinfo.c
+++ b/src/sysinfo.c
@ -18,138 +18,110 @@

 static uint32_t sd_tacc_max, sd_tacc_avg;

-void sysinfo_loop()
-{
+void sysinfo_loop() {
  sd_tacc_max = 0;
  sd_tacc_avg = 0;
-
-    while ( sram_readbyte( SRAM_CMD_ADDR ) != 0x00 )
-    {
+  while(sram_readbyte(SRAM_CMD_ADDR) != 0x00) {
    write_sysinfo();
-        delay_ms( 100 );
+    delay_ms(100);
  }
 }

-void write_sysinfo()
-{
+void write_sysinfo() {
  uint32_t sram_addr = SRAM_SYSINFO_ADDR;
  char linebuf[40];
  int len;
  int sd_ok = 0;
  uint8_t *sd_cid = sdn_getcid();
  uint32_t sd_tacc_max_int = sd_tacc_max / 1000;
-    uint32_t sd_tacc_max_frac = sd_tacc_max - ( sd_tacc_max_int * 1000 );
+  uint32_t sd_tacc_max_frac = sd_tacc_max - (sd_tacc_max_int * 1000);
  uint32_t sd_tacc_avg_int = sd_tacc_avg / 1000;
-    uint32_t sd_tacc_avg_frac = sd_tacc_avg - ( sd_tacc_avg_int * 1000 );
-    uint16_t numfiles = sram_readshort( SRAM_DB_ADDR + 12 );
-    uint16_t numdirs = sram_readshort( SRAM_DB_ADDR + 14 );
+  uint32_t sd_tacc_avg_frac = sd_tacc_avg - (sd_tacc_avg_int * 1000);
+  uint16_t numfiles = sram_readshort(SRAM_DB_ADDR+12);
+  uint16_t numdirs = sram_readshort(SRAM_DB_ADDR+14);
  int32_t sysclk = get_snes_sysclk();

-    len = snprintf( linebuf, sizeof( linebuf ), "Firmware version: %s", CONFIG_VERSION );
-    sram_writeblock( linebuf, sram_addr, 40 );
-    sram_memset( sram_addr + len, 40 - len, 0x20 );
+  len = snprintf(linebuf, sizeof(linebuf), "Firmware version: %s", CONFIG_VERSION);
+  sram_writeblock(linebuf, sram_addr, 40);
+  sram_memset(sram_addr+len, 40-len, 0x20);
  sram_addr += 40;
-    len = snprintf( linebuf, sizeof( linebuf ), "                                        " );
-    sram_writeblock( linebuf, sram_addr, 40 );
-    sram_memset( sram_addr + len, 40 - len, 0x20 );
+  len = snprintf(linebuf, sizeof(linebuf), "                                        ");
+  sram_writeblock(linebuf, sram_addr, 40);
+  sram_memset(sram_addr+len, 40-len, 0x20);
  sram_addr += 40;
-
-    if ( disk_state == DISK_REMOVED )
-    {
+  if(disk_state == DISK_REMOVED) {
    sd_tacc_max = 0;
    sd_tacc_avg = 0;
-        len = snprintf( linebuf, sizeof( linebuf ), "                                        " );
-        sram_writeblock( linebuf, sram_addr, 40 );
-        sram_memset( sram_addr + len, 40 - len, 0x20 );
+    len = snprintf(linebuf, sizeof(linebuf), "                                        ");
+    sram_writeblock(linebuf, sram_addr, 40);
+    sram_memset(sram_addr+len, 40-len, 0x20);
    sram_addr += 40;
-        len = snprintf( linebuf, sizeof( linebuf ), "         *** SD Card removed ***        " );
-        sram_writeblock( linebuf, sram_addr, 40 );
-        sram_memset( sram_addr + len, 40 - len, 0x20 );
+    len = snprintf(linebuf, sizeof(linebuf), "         *** SD Card removed ***        ");
+    sram_writeblock(linebuf, sram_addr, 40);
+    sram_memset(sram_addr+len, 40-len, 0x20);
    sram_addr += 40;
-        len = snprintf( linebuf, sizeof( linebuf ), "                                        " );
-        sram_writeblock( linebuf, sram_addr, 40 );
-        sram_memset( sram_addr + len, 40 - len, 0x20 );
+    len = snprintf(linebuf, sizeof(linebuf), "                                        ");
+    sram_writeblock(linebuf, sram_addr, 40);
+    sram_memset(sram_addr+len, 40-len, 0x20);
    sram_addr += 40;
-        len = snprintf( linebuf, sizeof( linebuf ), "                                        " );
-        sram_writeblock( linebuf, sram_addr, 40 );
-        sram_memset( sram_addr + len, 40 - len, 0x20 );
+    len = snprintf(linebuf, sizeof(linebuf), "                                        ");
+    sram_writeblock(linebuf, sram_addr, 40);
+    sram_memset(sram_addr+len, 40-len, 0x20);
    sram_addr += 40;
    sd_ok = 0;
-    }
+  } else {
+    len = snprintf(linebuf, sizeof(linebuf), "SD Maker/OEM:    0x%02x, \"%c%c\"", sd_cid[1], sd_cid[2], sd_cid[3]);
+    sram_writeblock(linebuf, sram_addr, 40);
+    sram_memset(sram_addr+len, 40-len, 0x20);
+    sram_addr += 40;
+    len = snprintf(linebuf, sizeof(linebuf), "SD Product Name: \"%c%c%c%c%c\", Rev. %d.%d", sd_cid[4], sd_cid[5], sd_cid[6], sd_cid[7], sd_cid[8], sd_cid[9]>>4, sd_cid[9]&15);
+    sram_writeblock(linebuf, sram_addr, 40);
+    sram_memset(sram_addr+len, 40-len, 0x20);
+    sram_addr += 40;
+    len = snprintf(linebuf, sizeof(linebuf), "SD Serial No.:   %02x%02x%02x%02x, Mfd. %d/%02d", sd_cid[10], sd_cid[11], sd_cid[12], sd_cid[13], 2000+((sd_cid[14]&15)<<4)+(sd_cid[15]>>4), sd_cid[15]&15);
+    sram_writeblock(linebuf, sram_addr, 40);
+    sram_memset(sram_addr+len, 40-len, 0x20);
+    sram_addr += 40;
+    if(sd_tacc_max)
+      len = snprintf(linebuf, sizeof(linebuf), "SD acc. time: %ld.%03ld / %ld.%03ld ms avg/max", sd_tacc_avg_int, sd_tacc_avg_frac, sd_tacc_max_int, sd_tacc_max_frac);
    else
-    {
-        len = snprintf( linebuf, sizeof( linebuf ), "SD Maker/OEM:    0x%02x, \"%c%c\"", sd_cid[1], sd_cid[2], sd_cid[3] );
-        sram_writeblock( linebuf, sram_addr, 40 );
-        sram_memset( sram_addr + len, 40 - len, 0x20 );
-        sram_addr += 40;
-        len = snprintf( linebuf, sizeof( linebuf ), "SD Product Name: \"%c%c%c%c%c\", Rev. %d.%d", sd_cid[4], sd_cid[5],
-                        sd_cid[6], sd_cid[7], sd_cid[8], sd_cid[9] >> 4, sd_cid[9] & 15 );
-        sram_writeblock( linebuf, sram_addr, 40 );
-        sram_memset( sram_addr + len, 40 - len, 0x20 );
-        sram_addr += 40;
-        len = snprintf( linebuf, sizeof( linebuf ), "SD Serial No.:   %02x%02x%02x%02x, Mfd. %d/%02d", sd_cid[10], sd_cid[11],
-                        sd_cid[12], sd_cid[13], 2000 + ( ( sd_cid[14] & 15 ) << 4 ) + ( sd_cid[15] >> 4 ), sd_cid[15] & 15 );
-        sram_writeblock( linebuf, sram_addr, 40 );
-        sram_memset( sram_addr + len, 40 - len, 0x20 );
-        sram_addr += 40;
-
-        if ( sd_tacc_max )
-        {
-            len = snprintf( linebuf, sizeof( linebuf ), "SD acc. time: %ld.%03ld / %ld.%03ld ms avg/max", sd_tacc_avg_int,
-                            sd_tacc_avg_frac, sd_tacc_max_int, sd_tacc_max_frac );
-        }
-        else
-        {
-            len = snprintf( linebuf, sizeof( linebuf ), "SD acc. time: measuring...  " );
-        }
-
-        sram_writeblock( linebuf, sram_addr, 40 );
-        sram_memset( sram_addr + len, 40 - len, 0x20 );
+      len = snprintf(linebuf, sizeof(linebuf), "SD acc. time: measuring...  ");
+    sram_writeblock(linebuf, sram_addr, 40);
+    sram_memset(sram_addr+len, 40-len, 0x20);
    sram_addr += 40;
    sd_ok = 1;
  }
-
-    len = snprintf( linebuf, sizeof( linebuf ), "                                        " );
-    sram_writeblock( linebuf, sram_addr, 40 );
-    sram_memset( sram_addr + len, 40 - len, 0x20 );
+  len = snprintf(linebuf, sizeof(linebuf), "                                        ");
+  sram_writeblock(linebuf, sram_addr, 40);
+  sram_memset(sram_addr+len, 40-len, 0x20);
  sram_addr += 40;
-    len = snprintf( linebuf, sizeof( linebuf ), "CIC state: %s", get_cic_statefriendlyname( get_cic_state() ) );
-    sram_writeblock( linebuf, sram_addr, 40 );
-    sram_memset( sram_addr + len, 40 - len, 0x20 );
+  len = snprintf(linebuf, sizeof(linebuf), "CIC state: %s", get_cic_statefriendlyname(get_cic_state()));
+  sram_writeblock(linebuf, sram_addr, 40);
+  sram_memset(sram_addr+len, 40-len, 0x20);
  sram_addr += 40;
-
-    if ( sysclk == -1 )
-    {
-        len = snprintf( linebuf, sizeof( linebuf ), "SNES master clock: measuring..." );
-    }
+  if(sysclk == -1)
+    len = snprintf(linebuf, sizeof(linebuf), "SNES master clock: measuring...");
  else
-    {
-        len = snprintf( linebuf, sizeof( linebuf ), "SNES master clock: %ldHz    ", get_snes_sysclk() );
-    }
-
-    sram_writeblock( linebuf, sram_addr, 40 );
-    sram_memset( sram_addr + len, 40 - len, 0x20 );
+    len = snprintf(linebuf, sizeof(linebuf), "SNES master clock: %ldHz    ", get_snes_sysclk());
+  sram_writeblock(linebuf, sram_addr, 40);
+  sram_memset(sram_addr+len, 40-len, 0x20);
  sram_addr += 40;
-    len = snprintf( linebuf, sizeof( linebuf ), "                                        " );
-    sram_writeblock( linebuf, sram_addr, 40 );
-    sram_memset( sram_addr + len, 40 - len, 0x20 );
+  len = snprintf(linebuf, sizeof(linebuf), "                                        ");
+  sram_writeblock(linebuf, sram_addr, 40);
+  sram_memset(sram_addr+len, 40-len, 0x20);
  sram_addr += 40;
-    len = snprintf( linebuf, sizeof( linebuf ), "Database: %d files, %d dirs", numfiles, numdirs );
-    sram_writeblock( linebuf, sram_addr, 40 );
-    sram_memset( sram_addr + len, 40 - len, 0x20 );
+  len = snprintf(linebuf, sizeof(linebuf), "Database: %d files, %d dirs", numfiles, numdirs);
+  sram_writeblock(linebuf, sram_addr, 40);
+  sram_memset(sram_addr+len, 40-len, 0x20);
  sram_addr += 40;
-    len = snprintf( linebuf, sizeof( linebuf ), "                                        " );
-    sram_writeblock( linebuf, sram_addr, 40 );
-    sram_memset( sram_addr + len, 40 - len, 0x20 );
+  len = snprintf(linebuf, sizeof(linebuf), "                                        ");
+  sram_writeblock(linebuf, sram_addr, 40);
+  sram_memset(sram_addr+len, 40-len, 0x20);
  sram_addr += 40;
-    len = snprintf( linebuf, sizeof( linebuf ), "                                        " );
-    sram_writeblock( linebuf, sram_addr, 40 );
-    sram_memset( sram_addr + len, 40 - len, 0x20 );
-    sram_hexdump( SRAM_SYSINFO_ADDR, 13 * 40 );
-
-    if ( sysclk != -1 && sd_ok )
-    {
-        sdn_gettacc( &sd_tacc_max, &sd_tacc_avg );
-    }
+  len = snprintf(linebuf, sizeof(linebuf), "                                        ");
+  sram_writeblock(linebuf, sram_addr, 40);
+  sram_memset(sram_addr+len, 40-len, 0x20);
+  sram_hexdump(SRAM_SYSINFO_ADDR, 13*40);
+  if(sysclk != -1 && sd_ok)sdn_gettacc(&sd_tacc_max, &sd_tacc_avg);
 }

--- a/src/tests.h
+++ b/src/tests.h
@ -7,6 +7,5 @@ void test_sdbench_local(char *filename);
 void test_rom_rw(void);
 void test_fpga_echo(void);

-int test_mem(void);

 #endif
--- a/src/tests/cli.c
+++ b/src/tests/cli.c
@ -138,7 +138,7 @@ static int8_t parse_wordlist(char *wordlist) {
        return -1;
      }

-      if (tolower(c) != tolower(*cur)) {
+      if (tolower((int)c) != tolower((int)*cur)) {
        // Check for end-of-word
        if (cur != curchar && (*cur == ' ' || *cur == 0)) {
          // Partial match found, return that
--- a/src/tests/main.c
+++ b/src/tests/main.c
@ -101,9 +101,9 @@ led_pwm();

  testresults[TEST_SD] = test_sd();
 //testresults[TEST_USB] = test_usb();
-  //testresults[TEST_RTC] = test_rtc();
+  testresults[TEST_RTC] = test_rtc();
  delay_ms(209);
-//  testresults[TEST_CIC] = test_cic();
+  testresults[TEST_CIC] = test_cic();
  testresults[TEST_FPGA] = test_fpga();
  testresults[TEST_RAM] = test_mem();
  printf("Loading SNES test ROM\n=====================\n");
--- a/src/tests/timer.c
+++ b/src/tests/timer.c
@ -73,8 +73,7 @@ void RIT_IRQHandler(void) {
  RIT_Hook();
 }

-void timer_init(void)
-{
+void timer_init(void) {
  /* turn on power to RIT */
  BITBAND(LPC_SC->PCONP, PCRIT) = 1;

@ -88,8 +87,7 @@ void timer_init(void)
  SysTick_Config((SysTick->CALIB & SysTick_CALIB_TENMS_Msk));
 }

-void delay_us(unsigned int time)
-{
+void delay_us(unsigned int time) {
  /* Prepare RIT */
  LPC_RIT->RICOUNTER = 0;
  LPC_RIT->RICOMPVAL = (CONFIG_CPU_FREQUENCY / 1000000) * time;
--- a/src/timer.c
+++ b/src/timer.c
@ -18,117 +18,101 @@ extern volatile int reset_pressed;
 volatile tick_t ticks;
 volatile int wokefromrit;

-void __attribute__( ( weak, noinline ) ) SysTick_Hook( void )
-{
+void __attribute__((weak,noinline)) SysTick_Hook(void) {
  /* Empty function for hooking the systick handler */
 }

 /* Systick interrupt handler */
-void SysTick_Handler( void )
-{
+void SysTick_Handler(void) {
  ticks++;
  static uint16_t sdch_state = 0;
  static uint16_t reset_state = 0;
-    sdch_state = ( sdch_state << 1 ) | SDCARD_DETECT | 0xe000;
-
-    if ( ( sdch_state == 0xf000 ) || ( sdch_state == 0xefff ) )
-    {
+  sdch_state = (sdch_state << 1) | SDCARD_DETECT | 0xe000;
+  if((sdch_state == 0xf000) || (sdch_state == 0xefff)) {
    sd_changed = 1;
  }
-
-    reset_state = ( reset_state << 1 ) | get_snes_reset() | 0xe000;
-
-    if ( ( reset_state == 0xf000 ) || ( reset_state == 0xefff ) )
-    {
-        reset_pressed = ( reset_state == 0xf000 );
+  reset_state = (reset_state << 1) | get_snes_reset() | 0xe000;
+  if((reset_state == 0xf000) || (reset_state == 0xefff)) {
+    reset_pressed = (reset_state == 0xf000);
    reset_changed = 1;
  }
-
  sdn_changed();
  SysTick_Hook();
 }

-void __attribute__( ( weak, noinline ) ) RIT_Hook( void )
-{
+void __attribute__((weak,noinline)) RIT_Hook(void) {
 }

-void RIT_IRQHandler( void )
-{
-    LPC_RIT->RICTRL = BV( RITINT );
-    NVIC_ClearPendingIRQ( RIT_IRQn );
+void RIT_IRQHandler(void) {
+  LPC_RIT->RICTRL = BV(RITINT);
+  NVIC_ClearPendingIRQ(RIT_IRQn);
  wokefromrit = 1;
  RIT_Hook();
 }

-void timer_init( void )
-{
+void timer_init(void) {
  /* turn on power to RIT */
-    BITBAND( LPC_SC->PCONP, PCRIT ) = 1;
+  BITBAND(LPC_SC->PCONP, PCRIT) = 1;

  /* clear RIT mask */
  LPC_RIT->RIMASK = 0; /*xffffffff;*/

  /* PCLK_RIT = CCLK */
-    BITBAND( LPC_SC->PCLKSEL1, 27 ) = 0;
-    BITBAND( LPC_SC->PCLKSEL1, 26 ) = 1;
+  BITBAND(LPC_SC->PCLKSEL1, 27) = 0;
+  BITBAND(LPC_SC->PCLKSEL1, 26) = 1;

  /* PCLK_TIMER3 = CCLK/4 */
-    BITBAND( LPC_SC->PCLKSEL1, 15 ) = 0;
-    BITBAND( LPC_SC->PCLKSEL1, 14 ) = 0;
+  BITBAND(LPC_SC->PCLKSEL1, 15) = 0;
+  BITBAND(LPC_SC->PCLKSEL1, 14) = 0;

  /* enable timer 3 */
-    BITBAND( LPC_SC->PCLKSEL1, PCLK_TIMER3 ) = 1;
+  BITBAND(LPC_SC->PCLKSEL1, PCLK_TIMER3) = 1;

  /* enable SysTick */
-    SysTick_Config( ( SysTick->CALIB & SysTick_CALIB_TENMS_Msk ) );
+  SysTick_Config((SysTick->CALIB & SysTick_CALIB_TENMS_Msk));
 }

-void delay_us( unsigned int time )
-{
+void delay_us(unsigned int time) {
  /* Prepare RIT */
  LPC_RIT->RICOUNTER = 0;
-    LPC_RIT->RICOMPVAL = ( CONFIG_CPU_FREQUENCY / 1000000 ) * time;
-    LPC_RIT->RICTRL    = BV( RITEN ) | BV( RITINT );
+  LPC_RIT->RICOMPVAL = (CONFIG_CPU_FREQUENCY / 1000000) * time;
+  LPC_RIT->RICTRL    = BV(RITEN) | BV(RITINT);

  /* Wait until RIT signals an interrupt */
-    while ( !( BITBAND( LPC_RIT->RICTRL, RITINT ) ) ) ;
+  while (!(BITBAND(LPC_RIT->RICTRL, RITINT))) ;

  /* Disable RIT */
  LPC_RIT->RICTRL = 0;
 }

-void delay_ms( unsigned int time )
-{
+void delay_ms(unsigned int time) {
  /* Prepare RIT */
  LPC_RIT->RICOUNTER = 0;
-    LPC_RIT->RICOMPVAL = ( CONFIG_CPU_FREQUENCY / 1000 ) * time;
-    LPC_RIT->RICTRL    = BV( RITEN ) | BV( RITINT );
+  LPC_RIT->RICOMPVAL = (CONFIG_CPU_FREQUENCY / 1000) * time;
+  LPC_RIT->RICTRL    = BV(RITEN) | BV(RITINT);

  /* Wait until RIT signals an interrupt */
-    while ( !( BITBAND( LPC_RIT->RICTRL, RITINT ) ) ) ;
+  while (!(BITBAND(LPC_RIT->RICTRL, RITINT))) ;

  /* Disable RIT */
  LPC_RIT->RICTRL = 0;
 }

-void sleep_ms( unsigned int time )
-{
+void sleep_ms(unsigned int time) {

  wokefromrit = 0;
  /* Prepare RIT */
  LPC_RIT->RICOUNTER = 0;
-    LPC_RIT->RICOMPVAL = ( CONFIG_CPU_FREQUENCY / 1000 ) * time;
-    LPC_RIT->RICTRL    = BV( RITEN ) | BV( RITINT );
-    NVIC_EnableIRQ( RIT_IRQn );
+  LPC_RIT->RICOMPVAL = (CONFIG_CPU_FREQUENCY / 1000) * time;
+  LPC_RIT->RICTRL    = BV(RITEN) | BV(RITINT);
+  NVIC_EnableIRQ(RIT_IRQn);

  /* Wait until RIT signals an interrupt */
-    //uart_putc(';');
-    while ( !wokefromrit )
-    {
+//uart_putc(';');
+  while(!wokefromrit) {
    __WFI();
  }
-
-    NVIC_DisableIRQ( RIT_IRQn );
+  NVIC_DisableIRQ(RIT_IRQn);
  /* Disable RIT */
-    LPC_RIT->RICTRL = BV( RITINT );
+  LPC_RIT->RICTRL = BV(RITINT);
 }
--- a/src/uart.c
+++ b/src/uart.c
@ -42,334 +42,249 @@
 #else
 #  error CONFIG_UART_NUM is not set or has an invalid value!
 #endif
-static uint8_t uart_lookupratio( float f_fr )
-{
-    uint16_t errors[72] = {0, 67, 71, 77, 83, 91, 100, 111, 125,
-                           133, 143, 154, 167, 182, 200, 214, 222, 231,
-                           250, 267, 273, 286, 300, 308, 333, 357, 364,
-                           375, 385, 400, 417, 429, 444, 455, 462, 467,
-                           500, 533, 538, 545, 556, 571, 583, 600, 615,
-                           625, 636, 643, 667, 692, 700, 714, 727, 733,
-                           750, 769, 778, 786, 800, 818, 833, 846, 857,
-                           867, 875, 889, 900, 909, 917, 923, 929, 933
-                          };
+static uint8_t uart_lookupratio(float f_fr) {
+  uint16_t errors[72]={0,67,71,77,83,91,100,111,125,
+                       133,143,154,167,182,200,214,222,231,
+                       250,267,273,286,300,308,333,357,364,
+                       375,385,400,417,429,444,455,462,467,
+                       500,533,538,545,556,571,583,600,615,
+                       625,636,643,667,692,700,714,727,733,
+                       750,769,778,786,800,818,833,846,857,
+                       867,875,889,900,909,917,923,929,933};

-    uint8_t ratios[72] = {0x10, 0xf1, 0xe1, 0xd1, 0xc1, 0xb1, 0xa1, 0x91, 0x81,
-                          0xf2, 0x71, 0xd2, 0x61, 0xb2, 0x51, 0xe3, 0x92, 0xd3,
-                          0x41, 0xf4, 0xb3, 0x72, 0xa3, 0xd4, 0x31, 0xe5, 0xb4,
-                          0x83, 0xd5, 0x52, 0xc5, 0x73, 0x94, 0xb5, 0xd6, 0xf7,
-                          0x21, 0xf8, 0xd7, 0xb6, 0x95, 0x74, 0xc7, 0x53, 0xd8,
-                          0x85, 0xb7, 0xe9, 0x32, 0xd9, 0xa7, 0x75, 0xb8, 0xfb,
-                          0x43, 0xda, 0x97, 0xeb, 0x54, 0xb9, 0x65, 0xdb, 0x76,
-                          0xfd, 0x87, 0x98, 0xa9, 0xba, 0xcb, 0xdc, 0xed, 0xfe
-                         };
+  uint8_t ratios[72]={0x10,0xf1,0xe1,0xd1,0xc1,0xb1,0xa1,0x91,0x81,
+                      0xf2,0x71,0xd2,0x61,0xb2,0x51,0xe3,0x92,0xd3,
+                      0x41,0xf4,0xb3,0x72,0xa3,0xd4,0x31,0xe5,0xb4,
+                      0x83,0xd5,0x52,0xc5,0x73,0x94,0xb5,0xd6,0xf7,
+                      0x21,0xf8,0xd7,0xb6,0x95,0x74,0xc7,0x53,0xd8,
+                      0x85,0xb7,0xe9,0x32,0xd9,0xa7,0x75,0xb8,0xfb,
+                      0x43,0xda,0x97,0xeb,0x54,0xb9,0x65,0xdb,0x76,
+                      0xfd,0x87,0x98,0xa9,0xba,0xcb,0xdc,0xed,0xfe};

-    int fr = ( f_fr - 1 ) * 1000;
-    int i = 0, i_result = 0;
-    int err = 0, lasterr = 1000;
-
-    for ( i = 0; i < 72; i++ )
-    {
-        if ( fr < errors[i] )
-        {
-            err = errors[i] - fr;
+  int fr = (f_fr-1)*1000;
+  int i=0, i_result=0;
+  int err=0, lasterr=1000;
+  for(i=0; i<72; i++) {
+    if(fr<errors[i]) {
+      err=errors[i]-fr;
+    } else {
+      err=fr-errors[i];
    }
-        else
-        {
-            err = fr - errors[i];
-        }
-
-        if ( err < lasterr )
-        {
-            i_result = i;
-            lasterr = err;
+    if(err<lasterr) {
+      i_result=i;
+      lasterr=err;
    }
  }
-
  return ratios[i_result];
 }

-static uint32_t baud2divisor( unsigned int baudrate )
-{
+static uint32_t baud2divisor(unsigned int baudrate) {
  uint32_t int_ratio;
  uint32_t error;
-    uint32_t dl = 0;
+  uint32_t dl=0;
  float f_ratio;
  float f_fr;
  float f_dl;
-    float f_pclk = ( float )CONFIG_CPU_FREQUENCY / CONFIG_UART_PCLKDIV;
+  float f_pclk = (float)CONFIG_CPU_FREQUENCY / CONFIG_UART_PCLKDIV;
  uint8_t fract_ratio;
-    f_ratio = ( f_pclk / 16 / baudrate );
-    int_ratio = ( int )f_ratio;
-    error = ( f_ratio * 1000 ) - ( int_ratio * 1000 );
-
-    if ( error > 990 )
-    {
+  f_ratio=(f_pclk / 16 / baudrate);
+  int_ratio = (int)f_ratio;
+  error=(f_ratio*1000)-(int_ratio*1000);
+  if(error>990) {
    int_ratio++;
+  } else if(error>10) {
+    f_fr=1.5;
+    f_dl=f_pclk / (16 * baudrate * (f_fr));
+    dl = (int)f_dl;
+    f_fr=f_pclk / (16 * baudrate * dl);
+    fract_ratio = uart_lookupratio(f_fr);
  }
-    else if ( error > 10 )
-    {
-        f_fr = 1.5;
-        f_dl = f_pclk / ( 16 * baudrate * ( f_fr ) );
-        dl = ( int )f_dl;
-        f_fr = f_pclk / ( 16 * baudrate * dl );
-        fract_ratio = uart_lookupratio( f_fr );
-    }
-
-    if ( !dl )
-    {
+  if(!dl) {
    return int_ratio;
-    }
-    else
-    {
-        return ( ( fract_ratio << 16 ) & 0xff0000 ) | dl;
+  } else {
+    return ((fract_ratio<<16)&0xff0000) | dl;
  }
 }

 static char txbuf[1 << CONFIG_UART_TX_BUF_SHIFT];
-static volatile unsigned int read_idx, write_idx;
+static volatile unsigned int read_idx,write_idx;

-void UART_HANDLER( void )
-{
+void UART_HANDLER(void) {
  int iir = UART_REGS->IIR;
-
-    if ( !( iir & 1 ) )
-    {
+  if (!(iir & 1)) {
    /* Interrupt is pending */
-        switch ( iir & 14 )
-        {
+    switch (iir & 14) {
 #if CONFIG_UART_NUM == 1
-
    case 0: /* modem status */
-            ( void ) UART_REGS->MSR; // dummy read to clear
+      (void) UART_REGS->MSR; // dummy read to clear
      break;
 #endif

    case 2: /* THR empty - send */
-            if ( read_idx != write_idx )
-            {
+      if (read_idx != write_idx) {
        int maxchars = 16;
-
-                while ( read_idx != write_idx && --maxchars > 0 )
-                {
-                    UART_REGS->THR = ( unsigned char )txbuf[read_idx];
-                    read_idx = ( read_idx + 1 ) & ( sizeof( txbuf ) - 1 );
+        while (read_idx != write_idx && --maxchars > 0) {
+          UART_REGS->THR = (unsigned char)txbuf[read_idx];
+          read_idx = (read_idx+1) & (sizeof(txbuf)-1);
        }
-
-                if ( read_idx == write_idx )
-                {
+        if (read_idx == write_idx) {
          /* buffer empty - turn off THRE interrupt */
-                    BITBAND( UART_REGS->IER, 1 ) = 0;
+          BITBAND(UART_REGS->IER, 1) = 0;
        }
      }
-
      break;
      
    case 12: /* RX timeout */
    case  4: /* data received - not implemented yet */
-            ( void ) UART_REGS->RBR; // dummy read to clear
+      (void) UART_REGS->RBR; // dummy read to clear
      break;

    case 6: /* RX error */
-            ( void ) UART_REGS->LSR; // dummy read to clear
+      (void) UART_REGS->LSR; // dummy read to clear

    default: break;
    }
  }
 }

-void uart_putc( char c )
-{
-    if ( c == '\n' )
-    {
-        uart_putc( '\r' );
-    }
+void uart_putc(char c) {
+  if (c == '\n')
+    uart_putc('\r');

-    unsigned int tmp = ( write_idx + 1 ) & ( sizeof( txbuf ) - 1 ) ;
+  unsigned int tmp = (write_idx+1) & (sizeof(txbuf)-1) ;

-    if ( read_idx == write_idx && ( BITBAND( UART_REGS->LSR, 5 ) ) )
-    {
+  if (read_idx == write_idx && (BITBAND(UART_REGS->LSR, 5))) {
    /* buffer empty, THR empty -> send immediately */
-        UART_REGS->THR = ( unsigned char )c;
-    }
-    else
-    {
+    UART_REGS->THR = (unsigned char)c;
+  } else {
 #ifdef CONFIG_UART_DEADLOCKABLE
-
-        while ( tmp == read_idx ) ;
-
+    while (tmp == read_idx) ;
 #endif
-        BITBAND( UART_REGS->IER, 1 ) = 0; // turn off UART interrupt
+    BITBAND(UART_REGS->IER, 1) = 0; // turn off UART interrupt
    txbuf[write_idx] = c;
    write_idx = tmp;
-        BITBAND( UART_REGS->IER, 1 ) = 1;
+    BITBAND(UART_REGS->IER, 1) = 1;
  }
 }

 /* Polling version only */
-unsigned char uart_getc( void )
-{
+unsigned char uart_getc(void) {
  /* wait for character */
-    while ( !( BITBAND( UART_REGS->LSR, 0 ) ) ) ;
-
+  while (!(BITBAND(UART_REGS->LSR, 0))) ;
  return UART_REGS->RBR;
 }

 /* Returns true if a char is ready */
-unsigned char uart_gotc( void )
-{
-    return BITBAND( UART_REGS->LSR, 0 );
+unsigned char uart_gotc(void) {
+  return BITBAND(UART_REGS->LSR, 0);
 }

-void uart_init( void )
-{
+void uart_init(void) {
  uint32_t div;

  /* Turn on power to UART */
-    BITBAND( LPC_SC->PCONP, UART_PCONBIT ) = 1;
+  BITBAND(LPC_SC->PCONP, UART_PCONBIT) = 1;

  /* UART clock = CPU clock - this block is reduced at compile-time */
-    if ( CONFIG_UART_PCLKDIV == 1 )
-    {
-        BITBAND( LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 1;
-        BITBAND( LPC_SC->UART_PCLKREG, UART_PCLKBIT + 1 ) = 0;
-    }
-    else if ( CONFIG_UART_PCLKDIV == 2 )
-    {
-        BITBAND( LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 0;
-        BITBAND( LPC_SC->UART_PCLKREG, UART_PCLKBIT + 1 ) = 1;
-    }
-    else if ( CONFIG_UART_PCLKDIV == 4 )
-    {
-        BITBAND( LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 0;
-        BITBAND( LPC_SC->UART_PCLKREG, UART_PCLKBIT + 1 ) = 0;
-    }
-    else     // Fallback: Divide by 8
-    {
-        BITBAND( LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 1;
-        BITBAND( LPC_SC->UART_PCLKREG, UART_PCLKBIT + 1 ) = 1;
+  if (CONFIG_UART_PCLKDIV == 1) {
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 1;
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT+1) = 0;
+  } else if (CONFIG_UART_PCLKDIV == 2) {
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 0;
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT+1) = 1;
+  } else if (CONFIG_UART_PCLKDIV == 4) {
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 0;
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT+1) = 0;
+  } else { // Fallback: Divide by 8
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 1;
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT+1) = 1;
  }

  /* set baud rate - no fractional stuff for now */
-    UART_REGS->LCR = BV( 7 ) | 3; // always 8n1
-    div = baud2divisor( CONFIG_UART_BAUDRATE );
+  UART_REGS->LCR = BV(7) | 3; // always 8n1
+  div = baud2divisor(CONFIG_UART_BAUDRATE);

  UART_REGS->DLL = div & 0xff;
-    UART_REGS->DLM = ( div >> 8 ) & 0xff;
-    BITBAND( UART_REGS->LCR, 7 ) = 0;
+  UART_REGS->DLM = (div >> 8) & 0xff;
+  BITBAND(UART_REGS->LCR, 7) = 0;

-    if ( div & 0xff0000 )
-    {
-        UART_REGS->FDR = ( div >> 16 ) & 0xff;
+  if (div & 0xff0000) {
+    UART_REGS->FDR = (div >> 16) & 0xff;
  }

  /* reset and enable FIFO */
-    UART_REGS->FCR = BV( 0 );
+  UART_REGS->FCR = BV(0);

  /* enable transmit interrupt */
-    BITBAND( UART_REGS->IER, 1 ) = 1;
-    NVIC_EnableIRQ( UART_IRQ );
+  BITBAND(UART_REGS->IER, 1) = 1;
+  NVIC_EnableIRQ(UART_IRQ);

  UART_REGS->THR = '?';
 }

 /* --- generic code below --- */
-void uart_puthex( uint8_t num )
-{
+void uart_puthex(uint8_t num) {
  uint8_t tmp;
-    tmp = ( num & 0xf0 ) >> 4;
-
-    if ( tmp < 10 )
-    {
-        uart_putc( '0' + tmp );
-    }
+  tmp = (num & 0xf0) >> 4;
+  if (tmp < 10)
+    uart_putc('0'+tmp);
  else
-    {
-        uart_putc( 'a' + tmp - 10 );
-    }
+    uart_putc('a'+tmp-10);

  tmp = num & 0x0f;
-
-    if ( tmp < 10 )
-    {
-        uart_putc( '0' + tmp );
-    }
+  if (tmp < 10)
+    uart_putc('0'+tmp);
  else
-    {
-        uart_putc( 'a' + tmp - 10 );
-    }
+    uart_putc('a'+tmp-10);
 }

-void uart_trace( void *ptr, uint16_t start, uint16_t len, uint32_t addr )
-{
+void uart_trace(void *ptr, uint16_t start, uint16_t len, uint32_t addr) {
  uint16_t i;
  uint8_t j;
  uint8_t ch;
  uint8_t *data = ptr;

-    data += start;
+  data+=start;
+  for(i=0;i<len;i+=16) {

-    for ( i = 0; i < len; i += 16 )
-    {
-
-        uart_puthex( ( addr + start ) >> 16 );
-        uart_puthex( ( ( addr + start ) >> 8 ) & 0xff );
-        uart_puthex( ( addr + start ) & 0xff );
-        uart_putc( '|' );
-        uart_putc( ' ' );
-
-        for ( j = 0; j < 16; j++ )
-        {
-            if ( i + j < len )
-            {
-                ch = *( data + j );
-                uart_puthex( ch );
+    uart_puthex((addr + start)>>16);
+    uart_puthex(((addr + start)>>8) & 0xff);
+    uart_puthex((addr + start)&0xff);
+    uart_putc('|');
+    uart_putc(' ');
+    for(j=0;j<16;j++) {
+      if(i+j<len) {
+        ch=*(data + j);
+        uart_puthex(ch);
+      } else {
+        uart_putc(' ');
+        uart_putc(' ');
      }
-            else
-            {
-                uart_putc( ' ' );
-                uart_putc( ' ' );
+      uart_putc(' ');
    }
-
-            uart_putc( ' ' );
-        }
-
-        uart_putc( '|' );
-
-        for ( j = 0; j < 16; j++ )
-        {
-            if ( i + j < len )
-            {
-                ch = *( data++ );
-
-                if ( ch < 32 || ch > 0x7e )
-                {
-                    ch = '.';
-                }
-
-                uart_putc( ch );
-            }
-            else
-            {
-                uart_putc( ' ' );
+    uart_putc('|');
+    for(j=0;j<16;j++) {
+      if(i+j<len) {
+        ch=*(data++);
+        if(ch<32 || ch>0x7e)
+          ch='.';
+        uart_putc(ch);
+      } else {
+        uart_putc(' ');
      }
    }
-
-        uart_putc( '|' );
+    uart_putc('|');
    uart_putcrlf();
-        start += 16;
+    start+=16;
  }
 }

-void uart_flush( void )
-{
-    while ( read_idx != write_idx ) ;
+void uart_flush(void) {
+  while (read_idx != write_idx) ;
 }

-void uart_puts( const char *text )
-{
-    while ( *text )
-    {
-        uart_putc( *text++ );
+void uart_puts(const char *text) {
+  while (*text) {
+    uart_putc(*text++);
  }
 }
--- a/src/uncfgware.c
+++ b/src/uncfgware.c
@ -1,16 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include "cfgware.h"
-
-int main( int argc, char *argv[] )
-{
-    int i;
-
-    for ( i = 0; i < sizeof( cfgware ); i++ )
-    {
-        printf( "%c", cfgware[i] );
-    }
-
-    return 0;
-}
--- a/src/utils/bin2h.c
+++ b/src/utils/bin2h.c
@ -1,77 +1,49 @@
 #include <stdio.h>
 #include <stdlib.h>

-int main( int argc, char *argv[] )
+int main(int argc, char *argv[])
 {
-    char var_name[30] = "cfgware";
+   char var_name[30] = "cfgware"
   FILE *fpIn = NULL, *fpOut = NULL;
   unsigned char buffer[5], i;
-    printf( "argc: %d\n", argc );
-
   if ( argc == 4 )
   {
-        fpIn = fopen( argv[1], "rb" );
-        fpOut = fopen( argv[2], "wt" );
-        sprintf( var_name, "%s", argv[3] );
+      fpIn = fopen(argv[1], "rb");
+      fpOut = fopen(argv[2], "wt");
   }
-    else if ( argc == 3 )
+   else if (argc == 3)
   {
-        fpIn = fopen( argv[1], "rb" );
-        fpOut = fopen( argv[2], "wt" );
-    }
-    else if ( argc == 2 )
-    {
-        fpIn = fopen( argv[1], "rb" );
+      fpIn = fopen(argv[1], "rb");
      fpOut = stdout;
   }
-    else if ( argc == 1 )
+   else if ( argc == 2 )
   {
      fpIn = stdin;
      fpOut = stdout;
   }
   else
   {
-        fprintf( stderr, "usage: %s [infile] [outfile] [name]\n", argv[0] );
+      fprintf(stderr, "usage: %s [infile] [outfile]\n", argv[0]);
      return -1;
   }
   
-    //   if (argc > 1)
-    //      sprintf()
+   if (argc > 1)
+      sprintf()

-    if ( fpIn == NULL )
-    {
-        fprintf( stderr, "Can't open '%s`: Aborting.", argv[1] );
-        return -1;
-    }
+   if (fpIn == NULL) { fprintf(stderr, "Can't open '%s`: Aborting.", argv[1]); return -1; }
+   if (fpOut == NULL) { fprintf(stderr, "Can't open '%s`: Aborting.", argv[2]); return -1; }
   
-    if ( fpOut == NULL )
-    {
-        fprintf( stderr, "Can't open '%s`: Aborting.", argv[2] );
-        return -1;
-    }
-
-    fprintf( fpOut, "const uint8_t %s[] = {\n", var_name );
+   fprintf(fpOut, "const uint8_t %s[] = {\n", var_name);
   i = 0;
-
-    while ( !feof( fpIn ) )
+   while(!feof(fpIn))
   {
-        fread( buffer, 1, 1, fpIn );
-        fprintf( fpOut, "0x%02X, ", buffer[0] );
-        i++;
-
-        if ( i > 8 )
-        {
-            fprintf( fpOut, "\n" );
-            i = 0;
+      fread(buffer, 1, 1, fpIn);
+      fprintf(fpOut, "0x%02X, ", buffer[0]);
+      i++; if (i > 8) { fprintf(fpOut, "\n"); i = 0; }
   }
-    }
-
-    if ( i > 0 )
-    {
-        fprintf( fpOut, "\n" );
-    }
-
-    fprintf( fpOut, "};" );
-    fclose( fpOut ); fclose( fpIn );
+   if (i > 0)
+      fprintf(fpOut, "\n");
+   fprintf(fpOut, "};");
+   fclose(fpOut); fclose(fpIn);
   return 0;
 }
--- a/src/utils/genhdr.c
+++ b/src/utils/genhdr.c
@ -12,142 +12,115 @@
 /* Generated on Thu Feb 17 10:57:01 2011,
 * by pycrc v0.7.1, http://www.tty1.net/pycrc/
 */
-uint32_t crc_reflect( uint32_t data, size_t data_len )
+uint32_t crc_reflect(uint32_t data, size_t data_len)
 {
    unsigned int i;
    uint32_t ret;

    ret = data & 0x01;
-
-    for ( i = 1; i < data_len; i++ )
+    for (i = 1; i < data_len; i++)
    {
        data >>= 1;
-        ret = ( ret << 1 ) | ( data & 0x01 );
+        ret = (ret << 1) | (data & 0x01);
    }
-
    return ret;
 }

-uint32_t crc_update( uint32_t crc, const uint8_t *buf, uint32_t len )
-{
+uint32_t crc_update(uint32_t crc, const uint8_t *buf, uint32_t len) {
    unsigned int i;
    uint32_t bit;
    uint8_t c;

-    while ( len-- )
-    {
+    while (len--) {
        c = *buf++;
-
-        for ( i = 0x01; i & 0xff; i <<= 1 )
-        {
+        for (i = 0x01; i & 0xff; i <<= 1) {
            bit = crc & 0x80000000;
-
-            if ( c & i )
-            {
+            if (c & i) {
                bit = bit ? 0 : 1;
            }
-
            crc <<= 1;
-
-            if ( bit )
-            {
+            if (bit) {
                crc ^= 0x04c11db7;
            }
        }
-
        crc &= 0xffffffff;
    }
-
    return crc & 0xffffffff;
 }

-int main( int argc, char **argv )
-{
+int main(int argc, char **argv) {
  FILE *f;
  size_t flen;

-    if ( argc < 3 )
-    {
-        printf( "Usage: genhdr <input file> <signature> <version>\n"
+  if(argc < 3) {
+    printf("Usage: genhdr <input file> <signature> <version>\n"
           "  input file: file to be headered\n"
           "  signature : magic value at start of header (4-char string)\n"
           "  version   : firmware version (decimal uint32)\n"
-                "Output is written in place.\n" );
+           "Output is written in place.\n");
    return 1;
  }
-
-    if ( ( f = fopen( argv[1], "rb+" ) ) == NULL )
-    {
-        printf( "Unable to open input file %s", argv[1] );
-        perror( "" );
+  if((f=fopen(argv[1], "rb+"))==NULL) {
+    printf("Unable to open input file %s", argv[1]);
+    perror("");
    return 1;
  }
+  fseek(f,0,SEEK_END);
+  flen=ftell(f);

-    fseek( f, 0, SEEK_END );
-    flen = ftell( f );
-
-    if ( flen + 256 < flen )
-    {
-        printf( "File too large ;)\n" );
+  if(flen+256 < flen) {
+    printf("File too large ;)\n");
    return 1;
  }
-
  char *remaining = NULL;
-    uint32_t version = ( uint32_t )strtol( argv[3], &remaining, 0 );
-
-    if ( *remaining )
-    {
-        printf( "could not parse version number (remaining portion: %s)\n", remaining );
-        fclose( f );
+  uint32_t version = (uint32_t)strtol(argv[3], &remaining, 0);
+  if(*remaining) {
+    printf("could not parse version number (remaining portion: %s)\n", remaining);
+    fclose(f);
    return 1;
  }

-    if ( strlen( argv[2] ) > 4 )
-    {
-        printf( "Magic string '%s' too long. Truncated to 4 characters.\n", argv[2] );
+  if(strlen(argv[2]) > 4) {
+    printf("Magic string '%s' too long. Truncated to 4 characters.\n", argv[2]);
  }
-
-    uint8_t *buf = malloc( flen + 256 );
-
-    if ( !buf )
-    {
-        perror( "malloc" );
+  uint8_t *buf = malloc(flen+256);
+  if(!buf) {
+    perror("malloc");
  }
-
-    memset( buf, 0xff, 256 );
-    fseek( f, 0, SEEK_SET );
-    fread( buf + 256, 1, flen, f );
+  memset(buf, 0xff, 256);
+  fseek(f, 0, SEEK_SET);
+  fread(buf+256, 1, flen, f);

  uint32_t crcc = 0xffffffff, crc;
-    crcc = crc_update( crcc, buf + 256, flen );
-    crcc = crc_reflect( crcc, 32 );
+  crcc = crc_update(crcc, buf+256, flen);
+  crcc = crc_reflect(crcc, 32);
  crc = crcc ^ 0xffffffff;

-    memset( buf, 0, 4 );
-    strncpy( ( char * )buf, argv[2], 4 );
+  memset(buf, 0, 4);
+  strncpy((char*)buf, argv[2], 4);

-    buf[4]  = ll8( version );
-    buf[5]  = lh8( version );
-    buf[6]  = hl8( version );
-    buf[7]  = hh8( version );
+  buf[4]  = ll8(version);
+  buf[5]  = lh8(version);
+  buf[6]  = hl8(version);
+  buf[7]  = hh8(version);

-    buf[8]  = ll8( flen );
-    buf[9]  = lh8( flen );
-    buf[10] = hl8( flen );
-    buf[11] = hh8( flen );
+  buf[8]  = ll8(flen);
+  buf[9]  = lh8(flen);
+  buf[10] = hl8(flen);
+  buf[11] = hh8(flen);

-    buf[12] = ll8( crc );
-    buf[13] = lh8( crc );
-    buf[14] = hl8( crc );
-    buf[15] = hh8( crc );
+  buf[12] = ll8(crc);
+  buf[13] = lh8(crc);
+  buf[14] = hl8(crc);
+  buf[15] = hh8(crc);

-    buf[16] = ll8( crcc );
-    buf[17] = lh8( crcc );
-    buf[18] = hl8( crcc );
-    buf[19] = hh8( crcc );
+  buf[16] = ll8(crcc);
+  buf[17] = lh8(crcc);
+  buf[18] = hl8(crcc);
+  buf[19] = hh8(crcc);

-    fseek( f, 0, SEEK_SET );
-    fwrite( buf, 1, 256 + flen, f );
-    fclose( f );
+  fseek(f, 0, SEEK_SET);
+  fwrite(buf, 1, 256+flen, f);
+  fclose(f);
  return 0;
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Godzil	0ea53495b0	Merge branch 'develop' into merging Conflicts: src/bootldr/fileops.h src/bootldr/iap.c src/fpga_spi.c src/memory.c src/smc.c verilog/sd2snes/address.v	2014-01-16 22:16:51 +00:00
Maximilian Rehkopf	3cc8af1753	Menu: rename menu labels to "filesel", minor tweaks/fixes	2013-10-18 15:35:41 +02:00
Maximilian Rehkopf	c8b24a9618	Firmware: fix loading of partial-size BS dumps	2013-10-18 15:32:42 +02:00
Maximilian Rehkopf	c380ce9503	Adjust OpenOCD configuration for more recent versions	2013-10-18 15:31:25 +02:00
Maximilian Rehkopf	a734ae1ec5	pamper the compiler	2013-10-18 15:30:08 +02:00
Maximilian Rehkopf	f7d393451a	Firmware: timeouts for FPGA configuration; LED flash codes for various FPGA related errors	2013-10-18 14:43:02 +02:00
Maximilian Rehkopf	28949ac307	Firmware: preparations for USB	2013-10-18 14:40:20 +02:00
Maximilian Rehkopf	4ff823078f	Bootloader: fix flash buffer alignment	2013-10-18 14:37:36 +02:00
Maximilian Rehkopf	988d84954b	Bootloader: change baud rate from 921600 to more common 115200	2013-10-18 14:37:12 +02:00
Maximilian Rehkopf	3f2e4e37db	menu: rename menu.a65 to filesel.a65; add required library to README	2013-10-18 14:20:19 +02:00
Maximilian Rehkopf	39b07df47e	Correct LoROM SRAM mapping for smaller ROMs SRAM is sometimes mapped not just to 70:0000-7fff but also to 70:8000-ffff if ROM size permits it (i.e. the ROM is small enough to avoid overlap). Map SRAM to 8000-ffff if the ROM mask denotes a ROM <= 16 MBits.	2013-06-30 23:42:28 +02:00
Maximilian Rehkopf	78beed80d7	FPGA: fix BSX PSRAM mapping	2013-06-26 10:44:57 +02:00
Maximilian Rehkopf	f7aa9832c6	update changelog	2012-11-18 21:01:39 +01:00
Maximilian Rehkopf	7233278db2	Firmware: fix FPGA DMA call	2012-11-18 20:12:19 +01:00
Maximilian Rehkopf	443f7b138c	Firmware: update version number to 0.1.5	2012-11-18 20:11:46 +01:00
Maximilian Rehkopf	e92ad06f38	FPGA/Cx4: slow down bus timing	2012-11-18 20:10:29 +01:00
Maximilian Rehkopf	fa1e09d867	FPGA: fix large SRAM mapping	2012-11-18 17:18:26 +01:00
Maximilian Rehkopf	e504079e5d	FPGA: slow down bus timing	2012-11-07 22:32:33 +01:00
Maximilian Rehkopf	1f5af01bc0	FPGA: add BS-X "hole" (regs 09-0b)	2012-11-07 22:31:28 +01:00
Maximilian Rehkopf	648569d900	Firmware: fix big SRAM handling	2012-11-07 22:29:38 +01:00
Maximilian Rehkopf	b91b598758	Firmware: fix MSU1 main loop behaviour	2012-11-07 11:06:56 +01:00
Maximilian Rehkopf	04c3cbc7a2	Firmware: [debug] log file size after loading	2012-11-07 11:06:29 +01:00
Maximilian Rehkopf	c204aa9a0b	Firmware/FPGA: replace magic numbers with constants	2012-11-07 11:03:58 +01:00
Maximilian Rehkopf	605fc2dfb1	Firmware: remove unused file sdcard.h	2012-11-07 09:54:30 +01:00
Maximilian Rehkopf	b67e2a5c77	Firmware: clean up clock/timer init	2012-11-07 09:44:50 +01:00
Maximilian Rehkopf	fee97e5016	Firmware/CLI: list short file name and file size in ls command; print file name when saving SRAM	2012-11-07 09:31:33 +01:00
Maximilian Rehkopf	ce23ff6954	Firmware/CLI: add memset command, rename 'resume' to 'exit'	2012-11-07 09:27:00 +01:00
Maximilian Rehkopf	83b18cc447	Firmware: fix compile errors with newer gccs	2012-11-07 09:23:50 +01:00
Maximilian Rehkopf	e33fbdf77f	menu: Ignore input from non-standard controllers (resolve #29 )	2012-09-30 00:24:48 +02:00
Maximilian Rehkopf	9287d637d1	FPGA: properly map large SRAM (LoROM > 32kB, HiROM > 8kB)	2012-09-24 22:52:05 +02:00
Maximilian Rehkopf	13c24bea9d	FPGA: more accurate BS-X memory map	2012-09-24 22:49:54 +02:00
Maximilian Rehkopf	791b688f40	menu: fix #26 : first note cut off on S-APU SNESes	2012-09-24 22:37:39 +02:00
Maximilian Rehkopf	5939b6e581	Firmware: sort by entire filename, not just first 20 characters	2012-08-25 19:36:24 +02:00