Big code cleanup and re-indented, finally ! (Thanks astyle!)

Develop

.gitignore

@@ -0,0 +1,22 @@
+*.cod
+*.hex
+*.lst
+*.o
+*.diff
+.DS_Store
+*.o65
+*.ips
+*.bin
+*.map
+*.o.d
+*.log
+*.smc
+*.sfc
+*~
+*.old
+*.elf
+*.img
+autoconf.h
+utils/rle
+utils/derle
+*.bit

CHANGELOG

@@ -38,3 +38,59 @@ v0.1.3
  * Some FPGA configuration error detection (mainly useful for hardware diag)
  * Fixes:
    - FPGA-side SD clock pullup (increases reliability with some cards)
+
+
+v0.1.4
+======
+
+ * SPC Player (contributed by necronomfive/blargg)
+ * System Information screen now shows CPU/PPU revision (contributed by necronomfive)
+ * Satellaview: basic data transmission packet support (makes some more games boot, thanks to LuigiBlood for assistance and sample data packets)
+ * Number of supported files increased to 50000 per card / 16380 per directory
+ * Slight speedup of menu text rendering
+ * Reduce load time of menu
+ * Adjust Cx4 timing to be more faithful
+   (Mega Man now defeats the boss in attract mode in Mega Man X2)
+ * adapt ROM mirroring size to file size if header information is invalid
+   (fixes Super Noah's Ark 3D, possibly others)
+ * MSU1 interface changes suggested by byuu:
+   - Data offset 0 and audio track 0 are automatically requested on reset.
+     This causes the busy flags to become 0 shortly after reset/startup.
+   - $2000 bit 3 is now "audio error", becomes valid after "audio busy" -> 0
+     set when an error occurred while preparing playback of the requested audio track
+ * write LED stays on when SRAM content changes constantly
+ * Fixes:
+   - fix empty save files on FAT16 / incorrect free cluster count on FAT32
+   - correct directory sorting (force parent directory at top of list)
+   - fix text corruption when entering a directory with a scrollable name
+   - fix files/dirs count in system information
+   - make 'sd2snes' directory hiding case-insensitive
+   - improve DAC I²S timing
+   - fix occasional palette corruption in menu
+   - fix SD clock glitch on ROM loading (occasional glitches/crashes)
+   - fix memory write timing on ROM loading (occasional glitches/crashes)
+   - fix SPI timing (ROMs not loading; System Information not working)
+   - properly synchronize SNES control signals (occasional glitches/crashes)
+   - fix floating IRQ output (occasional glitches/slowdowns)
+
+
+v0.1.4a (bugfix release)
+========================
+
+ * Fix DMA initialization in the menu (could cause sprite corruption in some games)
+
+
+v0.1.5
+======
+
+ * Sort directories by entire file name instead of first 20 characters only
+ * Correctly map SRAM larger than 8192 bytes (HiROM) / 32768 bytes (LoROM)
+   (fixes Dezaemon, Ongaku Tsukuuru - Kanadeeru)
+ * SPC player: fix soft fade-in (first note cut off) on S-APU consoles
+   (1CHIP / some Jr.)
+ * More accurate BS-X memory map
+ * Ignore input from non-standard controllers (Super Scope, Mouse etc.)
+ * Fixes:
+   - minor memory access timing tweaks
+     (should help with occasional glitches on some systems)
+

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 # 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 menu.o65 pad.o65 time.o65 mainmenu.o65 sysinfo.o65 spc700.o65 spcplay.o65 # gfx.o65 # vars.o65
 
 all: clean menu.bin map
 

snes/boot/const.a65

@@ -2,7 +2,8 @@ version		.byt "                            v0.1",0
 zero		.word	0
 bg2tile		.byt $20
 
-space64	.byt $20, $20, $20, $20, $20, $20, $20, $20
+space64	
+    .byt $20, $20, $20, $20, $20, $20, $20, $20
 	.byt $20, $20, $20, $20, $20, $20, $20, $20
 	.byt $20, $20, $20, $20, $20, $20, $20, $20
 	.byt $20, $20, $20, $20, $20, $20, $20, $20

snes/boot/data.a65

@@ -1,17 +1,17 @@
 .data
 ;don't anger the stack!
 ;----------parameters for text output----------
-print_x	.byt 0		;x coordinate
+print_x         .byt  0  ; x coordinate
                 .byt  0
-print_y	.byt 0		;y coordinate
+print_y         .byt  0  ; y coordinate
                 .byt  0
-print_src	.word 0	;source data address
-print_bank	.byt 0	;source data bank
-print_pal	.word 0	;palette number for text output
-print_temp	.word 0 ;work variable
-print_count	.byt 0	;how many characters may be printed?
-print_count_tmp .byt 0	;work variable
-print_done	.word 0  ;how many characters were printed?
+print_src       .word 0  ; source data address
+print_bank      .byt  0  ; source data bank
+print_pal       .word 0  ; palette number for text output
+print_temp      .word 0  ; work variable
+print_count     .byt  0  ; how many characters may be printed?
+print_count_tmp .byt  0  ; work variable
+print_done      .word 0  ; how many characters were printed?
 ;----------parameters for dma----------
 dma_a_bank      .byt  0
 dma_a_addr      .word 0
@@ -26,7 +26,8 @@ textdmasize	.word 0 ; number of bytes to copy each frame
 
 infloop         .byt 0,0  ; to be filled w/ 80 FE
 
-printloop_wram	.byt 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+printloop_wram 
+      .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
       .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
@@ -34,7 +35,8 @@ printloop_wram	.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
       .byt 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 
-loprint_wram	.byt 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+loprint_wram 
+      .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
       .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

snes/const.a65

@@ -168,4 +168,24 @@ text_mm_vmode_game	.byt "Game video mode", 0
 text_mm_sysinfo		.byt "System Information", 0
 text_statusbar_keys	.byt "A:Select B:Back X:Menu", 0
 text_last		.byt "Run previous ROM: Press Start again to confirm", 0
+text_system		.byt "CPU Rev.: x  PPU1 Rev.: y  PPU2 Rev.: z",0
 
+
+text_spcplay		.byt "SPC Music Player", 0
+spcplay_win_x		.byt 15
+spcplay_win_y		.byt 15
+spcplay_win_w		.byt 33
+spcplay_win_h		.byt 5
+
+text_spcload		.byt "Loading SPC data to SPC700...", 0
+text_spcstarta		.byt "**** Now playing SPC tune ****", 0
+text_spcstartb		.byt "Name:  ",0
+text_spcstartc		.byt "Song:  ",0
+text_spcstartd		.byt "Artist:",0
+
+spcstart_win_x		.byt 10
+spcstart_win_y		.byt 13
+spcstart_win_w		.byt 44
+spcstart_win_h		.byt 9
+
+text_spcid		.byt "SNES-SPC700"

snes/data.a65

@@ -16,7 +16,7 @@ dirend_onscreen	.byt 0
 dirlog_idx	.byt 0,0,0 ; long ptr
 direntry_fits_idx
 		.byt 0,0
-
+longptr		.byt 0,0,0 ; general purpose long ptr
 ;----------parameters for text output----------
 print_x	.byt 0		;x coordinate
 	.byt 0
@@ -26,8 +26,8 @@ print_src	.word 0	;source data address
 print_bank	.byt 0	;source data bank
 print_pal	.word 0	;palette number for text output
 print_temp	.word 0 ;work variable
-print_count	.byt 0	;how many characters may be printed?
-print_count_tmp .byt 0	;work variable
+print_ptr	.byt 0,0,0 ;read pointer
+print_count	.word 0	;how many characters may be printed?
 print_done	.word 0 ;how many characters were printed?
 print_over	.byt 0  ;was the string printed incompletely?
 ;----------parameters for dma----------
@@ -184,4 +184,17 @@ direntry_xscroll
 direntry_xscroll_wait
 	.word	0
 infloop	.byt 0,0  ; to be filled w/ 80 FE
+tgt_bright
+	.byt 0
+cur_bright
+	.byt 0
+
+;------------------------
+saved_sp
+	.word 0
+warm_signature
+	.word 0
+snes_system_config
+	.word 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+
 wram_fadeloop	.byt 0

snes/dma.a65

@@ -1,21 +1,4 @@
 
-dma0:
-	rep #$10 : .xl
-	sep #$20 : .as
-	lda dma_mode
-	sta $4300
-	lda dma_b_reg
-	sta $4301
-	lda dma_a_bank
-	ldx dma_a_addr
-	stx $4302
-	sta $4304
-	ldx dma_len
-	stx $4305
-	lda #$01
-	sta $420b
-	rts
-
 setup_hdma:
 	sep #$20 : .as
 	rep #$10 : .xl
@@ -67,8 +50,11 @@ setup_hdma:
 	sty $4352
 	sta $4354
 
-;	lda #$06
-;	sta $420c		;enable HDMA ch. 1+2
+	lda #$3a
+	sta $420c		;enable HDMA ch. 1+3+4+5
+	jsr waitblank
+	lda #$3e
+	sta $420c		;enable HDMA ch. 2 too
 	lda #$81		;VBlank NMI + Auto Joypad Read
 	sta $4200		;enable V-BLANK NMI
 	rts

snes/dma.i65

@@ -1,13 +1,22 @@
+#define hash #
+#define f(x) x
+#define imm(a) f(hash)a
+
 #define DMA0(mode, len, a_bank, a_addr, b_reg)\
-	lda mode \
-: 	sta dma_mode \
+	php \
+:	sep imm($20) : .as \
+:	rep imm($10) : .xl \
+:	lda mode \
+: 	sta $4300 \
 :	ldx a_addr \
 :	lda a_bank \
-:	stx dma_a_addr \
-:	sta dma_a_bank \
+:	stx $4302 \
+:	sta $4304 \
 :	ldx len \
-:	stx dma_len \
+:	stx $4305 \
 :	lda b_reg \
-:	sta dma_b_reg \
-:	jsr dma0
+:	sta $4301 \
+:	lda imm($01) \
+:	sta $420b \
+:	plp
 

snes/main.a65

@@ -4,13 +4,45 @@
 GAME_MAIN:
 	sep #$20 : .as
 	lda #$00
-	sta @AVR_CMD
+	sta @MCU_CMD		; clear MCU command register
 	rep #$20 : .al
 	lda #$0000
-	sta @AVR_PARAM
-	sta @AVR_PARAM+2
+	sta @MCU_PARAM		; clear MCU command parameters
+	sta @MCU_PARAM+2
 	sep #$20 : .as
 	stz $4200 ; inhibit VBlank NMI
+	rep #$20 : .al
+	lda @warm_signature	; Was CMD_RESET issued before reset?
+	cmp #$fa50		; If yes, then perform warm boot procedure
+	bne coldboot
+	lda #$0000
+	sta @warm_signature
+	lda @saved_sp		; Restore previous stack pointer
+	tcs
+	sep #$20 : .as
+
+	jsr killdma		; The following initialization processes must not touch memory
+	jsr waitblank		; structures used by the main menu !
+	jsr snes_init
+	cli
+	lda #$01
+	sta $420d 		; fast cpu
+	jsr setup_gfx
+	jsr colortest
+	jsr tests
+	jsr setup_hdma
+	lda #$0f
+	sta cur_bright
+	sta tgt_bright
+	sta $2100
+
+	jmp @set_bank		; Set bios bank, just to be sure
+set_bank:
+	plp			; Restore processor state
+	rts			; Jump to the routine which called the sub-routine issuing CMD_RESET
+
+coldboot:							; Regular, cold-start init
+	sep #$20 : .as
 	jsr killdma
 	jsr waitblank
 	jsr snes_init
@@ -18,9 +50,11 @@ GAME_MAIN:
 	sta $420d ; fast cpu
 	jsr setup_gfx
 	jsr colortest
-	jsr setup_hdma
 	jsr menu_init
 	jsr tests
+	jsr setup_hdma
+	jsr screen_on
+
 	sep #$20 : .as
 	lda @RTC_STATUS
 	beq +
@@ -32,50 +66,93 @@ GAME_MAIN:
 	jmp @infloop	;infinite loop in WRAM
 
 killdma:
-	stz $420b
-	stz $420c
+	stz $4300
+	stz $4301
+	stz $4302
+	stz $4303
+	stz $4304
+	stz $4305
+	stz $4306
+	stz $4307
+	stz $4308
+	stz $4309
+	stz $430a
+	stz $430b
 	stz $4310
 	stz $4311
 	stz $4312
 	stz $4313
 	stz $4314
+	stz $4315
+	stz $4316
+	stz $4317
+	stz $4318
+	stz $4319
+	stz $431a
+	stz $431b
 	stz $4320
 	stz $4321
 	stz $4322
 	stz $4323
 	stz $4324
+	stz $4325
+	stz $4326
+	stz $4327
+	stz $4328
+	stz $4329
+	stz $432a
+	stz $432b
 	stz $4330
 	stz $4331
 	stz $4332
 	stz $4333
 	stz $4334
+	stz $4335
+	stz $4336
+	stz $4337
+	stz $4338
+	stz $4339
+	stz $433a
+	stz $433b
 	stz $4340
 	stz $4341
 	stz $4342
 	stz $4343
 	stz $4344
+	stz $4345
+	stz $4346
+	stz $4347
+	stz $4348
+	stz $4349
+	stz $434a
+	stz $434b
 	stz $4350
 	stz $4351
 	stz $4352
 	stz $4353
 	stz $4354
-	stz $4360
-	stz $4361
-	stz $4362
-	stz $4363
-	stz $4364
+	stz $4355
+	stz $4356
+	stz $4357
+	stz $4358
+	stz $4359
+	stz $435a
+	stz $435b
+
+	stz $420b
+	stz $420c
 	rts
 
-
-
-
 waitblank:
+	php
+	sep #$30 : .as : .xs
 -	lda $4212
 	and #$80
 	bne -
 -	lda $4212
 	and #$80
 	beq -
+	plp
 	rts
 
 colortest:
@@ -91,11 +168,11 @@ setup_gfx:
 	stz $420b
 	stz $420c
 ;clear tilemap buffers
-	ldx #$0000
+	ldx #$8000
 	stx $2181
-	lda #$01
+	lda #$00
 	sta $2183
-	DMA0(#$08, #0, #^zero, #!zero, #$80)
+	DMA0(#$08, #$8000, #^zero, #!zero, #$80)
 
 ;generate fonts
 	jsr genfonts
@@ -146,6 +223,7 @@ setup_gfx:
 ;set palette
 	stz $2121
 	DMA0(#$00, #$200, #^palette, #!palette, #$22)
+	stz $2121
 
 ;copy hdma tables so we can work "without" the cartridge
 ;palette
@@ -198,7 +276,7 @@ setup_gfx:
 tests:
 	sep #$20 : .as		;8-bit accumulator
 	rep #$10 : .xl		;16-bit index
-	lda #$03		;mode 3, mode 5 via HDMA :D
+	lda #$03		;mode 3, mode 5 via HDMA
 	sta $2105
 	lda #$58		;Tilemap addr 0xB000
 	ora #$02		;SC size 32x64
@@ -224,11 +302,17 @@ tests:
 	lda #$1f
 	sta $212e
 	sta $212f
-	stz $2121
-	lda #$0f
-	sta $2100		;screen on, full brightness
-	lda #9
+;	stz $2121
+	lda #8
 	sta bar_yl
+	stz cur_bright
+	stz tgt_bright
+	rts
+
+screen_on:
+	stz $2100		;screen on, 0% brightness
+	lda #$0f
+	sta tgt_bright
 	rts
 
 snes_init:
@@ -248,6 +332,7 @@ snes_init:
 	stz $420a		;
 	stz $420b		;
 	stz $420c		;
+	stz $420d		;
 	lda #$8f
 	sta $2100		;INIDISP: force blank
 	lda #$03		; 8x8+16x16; name=0; base=3
@@ -339,7 +424,7 @@ snes_init:
 
 fadeloop:
 	sep #$30 : .as : .xs
-	ldx #$0f
+	ldx cur_bright
 	and #$00
 	pha
 	plb

snes/memmap.i65

@@ -6,19 +6,24 @@
 /* These must be defined as constants, because they're used
  * in calculation that is sent to PPU as parameters */
 
+#define APUIO0		$2140
+#define APUIO1		$2141
+#define APUIO2		$2142
+#define APUIO3		$2143
+
 #define BG1_TILE_BASE	$5800
 #define BG2_TILE_BASE	$5000
 
 #define OAM_TILE_BASE	$6000
 
-#define BG1_TILE_BUF	$7FB000
-#define BG2_TILE_BUF	$7FA000
+#define BG1_TILE_BUF	$7EB000
+#define BG2_TILE_BUF	$7EA000
 
-#define BG1_TILE_BAK	$7F9000
-#define BG2_TILE_BAK	$7F8000
+#define BG1_TILE_BAK	$7E9000
+#define BG2_TILE_BAK	$7E8000
 
-#define AVR_CMD		$307000
-#define AVR_PARAM	$307004
+#define MCU_CMD		$307000
+#define MCU_PARAM	$307004
 #define RTC_STATUS	$307100
 #define LAST_STATUS	$307101
 #define SYSINFO_BLK	$307200
@@ -27,3 +32,9 @@
 #define ROOT_DIR	$C10000
 
 #define CMD_SYSINFO	$03
+#define CMD_LOADSPC	$05
+#define CMD_RESET	$06
+
+#define SPC_DATA	$FD0000
+#define SPC_HEADER	$FE0000
+#define SPC_DSP_REGS	$FE0100

snes/menu.a65

@@ -42,7 +42,6 @@ menuloop_s1
 	lda isr_done
 	lsr
 	bcc menuloop_s1
-
 	stz isr_done
 	jsr printtime
 	jsr menu_updates	;update stuff, check keys etc
@@ -272,6 +271,10 @@ dirent_is_file
 	lda #$0000
 	bra dirent_type_cont
 +
+	cmp #$0003  ;SPC -> palette 2
+	bne +
+	lda #$0002
+	bra dirent_type_cont
 	cmp #$0004	;IPS -> palette 2 (green)
 	bne +
         lda #$0002
@@ -475,6 +478,8 @@ menu_key_start:
 	rts
 
 menu_key_b:
+	stz direntry_xscroll
+	stz direntry_xscroll_state
 	rep #$20 : .al
 	lda dirstart_addr
 	beq skip_key_b
@@ -500,6 +505,8 @@ select_item:
 	lda [dirptr_addr], y
 	cmp #$01
 	beq sel_is_file
+	cmp #$03
+	beq sel_is_spc
 	cmp #$04
 	beq sel_is_file
 	cmp #$80
@@ -517,25 +524,28 @@ sel_is_parent
 sel_is_dir
 	jsr select_dir
 	bra select_item_cont
+sel_is_spc
+	jsr select_spc
+	bra select_item_cont
 
 select_file:
-	; have avr load the rom
+	; have MCU load the rom
 	dey
 	rep #$20 : .al
 	lda [dirptr_addr], y
 	and #$00ff
-	sta @AVR_PARAM+2
+	sta @MCU_PARAM+2
 	dey
 	dey
 	lda [dirptr_addr], y
-	sta @AVR_PARAM
+	sta @MCU_PARAM
 	sep #$20 : .as
-	lda #$01
-	sta @AVR_CMD
-select_file_fade:
 	lda #$00
 	sta @$4200
 	sei
+	lda #$01
+	sta @MCU_CMD
+select_file_fade:
 	jsl @wram_fadeloop
 	rts
 
@@ -595,6 +605,8 @@ select_dir:
 	sta @dirstart_addr
 	lda #$0000
 	sta @menu_sel
+	sta @direntry_xscroll
+	sta @direntry_xscroll_state
 	sep #$20 : .as
 	lda #$01
 	sta @menu_dirty
@@ -633,6 +645,27 @@ select_parent:
 	sta @menu_dirty
 	rts
 
+select_spc:
+	dey
+	rep #$20 : .al
+	lda [dirptr_addr], y
+	and #$00ff
+	sta @MCU_PARAM+2
+	dey
+	dey
+	lda [dirptr_addr], y
+	sta @MCU_PARAM
+	sep #$20 : .as
+	lda #CMD_LOADSPC
+	sta @MCU_CMD
+wait_spc:
+	lda @MCU_CMD
+	cmp #$00
+	bne wait_spc
+	jsr spcplayer
+	jsr restore_screen
+	rts
+
 menu_key_x:
 	jsr mainmenu
 	rts
@@ -772,7 +805,7 @@ select_last_file:
 	and pad1trig+1
 	beq -
 	lda #$04
-	sta @AVR_CMD
+	sta @MCU_CMD
 	jmp select_file_fade
 +	jsr restore_screen
 	plp
@@ -848,6 +881,7 @@ scroll_direntry_scrollfast
 	lda #$28
 	sta direntry_xscroll_wait
 +	lda direntry_xscroll_state
+	clc
 	adc direntry_xscroll
 	sta direntry_xscroll
 	bne +

snes/pad.a65

@@ -4,7 +4,15 @@ read_pad:
 read_pad1
 	ldx pad1mem 	;byetUDLRaxlriiii
 	lda $4218
-	ora $421a
+	and #$000f
+	bne +
+	lda $4218
++	sta pad1mem
+	lda $421a
+	and #$000f
+	bne +
+	lda $421a
++	ora pad1mem
 	sta pad1mem
 	and #$0f00
 	bne read_pad1_count

snes/reset.a65

@@ -84,9 +84,29 @@ math_cont
 	clc
 	adc bar_x	; + X start coord
 	sta $2127	; window 1 right
-	lda #$3e	; ch. 1-5
-	sta @$420c	; trigger HDMA
-	lda #$01
+;	lda #$3e	; ch. 1-5
+;	sta @$420c	; trigger HDMA
+
+	lda cur_bright
+	cmp tgt_bright
+	beq +
+	bpl bright_down
+bright_up
+	inc
+	sta cur_bright
+	lda $2100
+	and #$f0
+	ora cur_bright
+	sta $2100
+	bra +
+bright_down
+	dec
+	sta cur_bright
+	lda $2100
+	and #$f0
+	ora cur_bright
+	sta $2100
++	lda #$01
 	sta isr_done
         rtl
 

snes/spc700.a65

@@ -0,0 +1,61 @@
+; All SPC700 routines in SPC700 machine code
+; SPC loader & transfer routines by Shay Green <gblargg@gmail.com>
+
+loader				; .org $0002
+	.byt $F8,$21		;	mov x,@loader_data
+	.byt $BD		;	mov sp,x
+	.byt $CD,$22		;	mov x,#@loader_data+1
+
+	; Push PC and PSW from SPC header
+	.byt $BF		;	mov a,(x)+
+	.byt $2D		;	push a
+	.byt $BF		;	mov a,(x)+
+	.byt $2D		;	push a
+	.byt $BF		;	mov a,(x)+
+	.byt $2D		;	push a
+
+	; Set FLG to $60 rather than value from SPC
+	.byt $E8,$60		;	mov a,#$60
+	.byt $D4,$6C		;	mov FLG+x,a
+
+	; Restore DSP registers
+	.byt $8D,$00		;	mov y,#0
+	.byt $BF		; next:	mov a,(x)+
+	.byt $CB,$F2		;	mov $F2,y
+	.byt $C4,$F3		;	mov $F3,a
+	.byt $FC		;	inc y
+	.byt $10,-8		;	bpl next
+
+	.byt $8F,$6C,$F2	;	mov $F2,#FLG	; set for later
+
+	; Rerun loader
+	.byt $5F,$C0,$FF	;	jmp $FFC0
+
+;---------------------------------------
+
+transfer			; .org $0002
+
+	.byt $CD,$FE		; mov x,#$FE		; transfer 254 pages
+
+	; Transfer four-byte chunks
+	.byt $8D,$3F		; page: mov y,#$3F
+	.byt $E4,$F4		; quad: mov a,$F4
+	.byt $D6,$00,$02	; mov0: mov !$0200+y,a
+	.byt $E4,$F5		;	mov a,$F5
+	.byt $D6,$40,$02	; mov1: mov !$0240+y,a
+	.byt $E4,$F6		;	mov a,$F6
+	.byt $D6,$80,$02	; mov2: mov !$0280+y,a
+	.byt $E4,$F7		;	mov a,$F7	; tell S-CPU we're ready for more
+	.byt $CB,$F7		;	mov $F7,Y
+	.byt $D6,$C0,$02	; mov3: mov !$02C0+y,a
+	.byt $DC 		;	dec y
+	.byt $10,-25		;	bpl quad
+	; Increment MSBs of addresses
+	.byt $AB,$0A		;	inc mov0+2
+	.byt $AB,$0F		;	inc mov1+2
+	.byt $AB,$14		;	inc mov2+2
+	.byt $AB,$1B		;	inc mov3+2
+	.byt $1D    		;	dec x
+	.byt $D0,-38		;	bne page
+	; Rerun loader
+	.byt $5F,$C0,$FF	;	jmp $FFC0

snes/spcplay.a65

@@ -0,0 +1,676 @@
+#include "memmap.i65"
+
+; SPC Player
+; SPC700 transfer and IO routines by Shay Green <gblargg@gmail.com>
+
+spcplayer:
+	php
+	sep #$30 : .as : .xs
+
+	ldx #$0a	; Check if SPC header is present
+-
+	lda @SPC_HEADER,x
+	cmp @text_spcid,x
+	beq +
+	jmp spc_exit
++
+	dey
+	bne -
+
+	rep #$10 : .xl	; Now draw lots of stuff
+
+	stz bar_wl
+	dec bar_wl
+	stz bar_xl
+	dec bar_xl
+	stz bar_yl
+	dec bar_yl
+	jsr backup_screen
+
+	lda #^text_spcplay	; Loading window
+	sta window_tbank
+	ldx #!text_spcplay
+	stx window_taddr
+	lda @spcplay_win_x
+	sta window_x
+	lda @spcplay_win_y
+	sta window_y
+	lda @spcplay_win_w
+	sta window_w
+	lda @spcplay_win_h
+	sta window_h
+	jsr draw_window
+
+	lda #^text_spcload	; Loading text
+	ldx #!text_spcload
+	sta print_bank
+	stx print_src
+	stz print_pal
+	lda #29
+	sta print_count
+	lda #17
+	sta print_y
+	lda #17
+	sta print_x
+	jsr hiprint
+
+	stz isr_done
+-
+	lda isr_done		; Wait until text is being printed...
+	beq -
+
+	jsr spc700_load		; Load SPC into SPC700
+
+	lda #^text_spcplay
+	sta window_tbank
+	ldx #!text_spcplay
+	stx window_taddr
+	lda @spcstart_win_x
+	sta window_x
+	lda @spcstart_win_y
+	sta window_y
+	lda @spcstart_win_w
+	sta window_w
+	lda @spcstart_win_h
+	sta window_h
+	jsr draw_window
+
+	lda #^text_spcstarta
+	ldx #!text_spcstarta
+	sta print_bank
+	stx print_src
+	lda #$01
+	sta print_pal
+	lda #30
+	sta print_count
+	lda #15
+	sta print_y
+	lda #17
+	sta print_x
+	jsr hiprint
+
+	lda #^text_spcstartb
+	ldx #!text_spcstartb
+	sta print_bank
+	stx print_src
+	lda #$01
+	sta print_pal
+	lda #07
+	sta print_count
+	lda #17
+	sta print_y
+	lda #12
+	sta print_x
+	jsr hiprint
+
+	lda #$fe
+	ldx #$004e
+	sta print_bank
+	stx print_src
+	stz print_pal
+	lda #32
+	sta print_count
+	lda #17
+	sta print_y
+	lda #20
+	sta print_x
+	jsr hiprint
+
+	lda #^text_spcstartc
+	ldx #!text_spcstartc
+	sta print_bank
+	stx print_src
+	lda #$01
+	sta print_pal
+	lda #07
+	sta print_count
+	lda #18
+	sta print_y
+	lda #12
+	sta print_x
+	jsr hiprint
+
+	lda #$fe
+	ldx #$002e
+	sta print_bank
+	stx print_src
+	stz print_pal
+	lda #32
+	sta print_count
+	lda #18
+	sta print_y
+	lda #20
+	sta print_x
+	jsr hiprint
+
+	lda #^text_spcstartd
+	ldx #!text_spcstartd
+	sta print_bank
+	stx print_src
+	lda #$01
+	sta print_pal
+	lda #07
+	sta print_count
+	lda #19
+	sta print_y
+	lda #12
+	sta print_x
+	jsr hiprint
+
+	lda #$fe
+	ldx #$00b0
+        sta longptr+2
+	sta print_bank
+        stx longptr
+        ldy #$00
+        lda [longptr], y
+        cmp #$41
+        bpl +
+        inx
++	stx print_src
+	stz print_pal
+	lda #32
+	sta print_count
+	lda #19
+	sta print_y
+	lda #20
+	sta print_x
+	jsr hiprint
+
+spc_playloop:
+	lda isr_done	; SPC player loop
+	lsr
+	bcc spc_playloop
+	jsr printtime
+	stz isr_done
+
+	jsr read_pad
+	lda #$80
+	and pad1trig+1
+	bne spc_key_b
+	bra spc_playloop
+
+spc_key_b:
+	rep #$20 : .al
+	tsc
+	sta saved_sp	; Save SP for later re-entry
+	lda #$fa50	; Write reset signature
+	sta @warm_signature
+	sep #$20 : .as
+
+	sei		; Blank screen & issue CMD_RESET command to Microcontroller...
+	stz $2100	; ...this is required, because there is no other way to stop S-SMP & S-DSP
+	lda #CMD_RESET
+	sta @MCU_CMD
+-
+	bra -		; At this point, the SNES waits for an external reset from the Microcontroller
+
+spc_exit:		; Return from player in case of wrong SPC file data
+	plp
+	rts
+
+;---------------------------------------
+spc700_load:
+	php
+	sep #$20 : .as
+	rep #$10 : .xl
+
+	sei			; Disable NMI & IRQ
+	stz $4200		; The SPC player code is really timing sensitive ;)
+	jsr upload_dsp_regs	; Upload S-DSP registers
+	jsr upload_high_ram	; Upload 63.5K of SPC700 ram
+	jsr upload_low_ram	; Upload rest of ram
+	jsr restore_final	; Restore SPC700 state & start execution
+
+	lda #$81		; VBlank NMI + Auto Joypad Read
+	sta $4200		; enable V-BLANK NMI
+	cli
+	plp
+	rts
+;---------------------------------------
+; Uploads DSP registers and some other setup code
+upload_dsp_regs:
+
+; ---- Begin upload
+
+	ldy #$0002
+	jsr spc_begin_upload
+
+; ---- Upload loader
+
+	ldx #$0000
+-
+	lda @loader,x
+	jsr spc_upload_byte
+	inx
+	cpy #31		; size of loader
+	bne -
+
+; ---- Upload SP, PC & PSW
+
+	lda @SPC_HEADER+43
+	jsr spc_upload_byte
+	lda @SPC_HEADER+38
+	jsr spc_upload_byte
+	lda @SPC_HEADER+37
+	jsr spc_upload_byte
+	lda @SPC_HEADER+42
+	jsr spc_upload_byte
+
+; ---- Upload DSP registers
+
+	ldx #$0000
+-
+; initialize FLG and KON ($6c/$4c) to avoid artifacts
+	cpx #$4C
+	bne +
+	lda #$00
+	bra upload_skip_load
++
+	cpx #$6C
+	bne +
+	lda #$E0
+	bra upload_skip_load
++
+	lda @SPC_DSP_REGS,x
+upload_skip_load
+	jsr spc_upload_byte
+	inx
+	cpx #128
+	bne -
+
+; --- Upload fixed values for $F1-$F3
+
+	ldy #$00F1
+	jsr spc_next_upload
+
+	lda #$80        ; stop timers
+	jsr spc_upload_byte
+	lda #$6c        ; get dspaddr set for later
+	jsr spc_upload_byte
+	lda #$60
+	jsr spc_upload_byte
+
+; ---- Upload $f8-$1ff
+
+	ldy #$00F8
+	jsr spc_next_upload
+
+	ldx #$00F8
+-
+	lda @SPC_DATA,x
+	jsr spc_upload_byte
+	inx
+	cpx #$200
+	bne -
+
+; ---- Execute loader
+
+	ldy #$0002
+	jsr spc_execute
+	rts
+;---------------------------------------
+upload_high_ram:
+
+	ldy #$0002
+	jsr spc_begin_upload
+
+; ---- Upload transfer routine
+
+	ldx #$0000
+-
+	lda @transfer,x
+	jsr spc_upload_byte
+	inx
+	cpy #43		; size of transfer routine
+	bne -
+
+	ldx #$023f	; prepare transfer address
+
+; ---- Execute transfer routine
+
+	ldy #$0002
+	sty APUIO2
+	stz APUIO1
+	lda APUIO0
+	inc
+	inc
+	sta APUIO0
+; Wait for acknowledgement
+-
+	cmp APUIO0
+	bne -
+
+; ---- Burst transfer of 63.5K using custom routine
+
+outer_transfer_loop:
+	ldy #$003f		; 3
+inner_transfer_loop:
+	lda @SPC_DATA,x		; 5 |
+	sta APUIO0		; 4 |
+	lda @SPC_DATA+$40,x	; 5 |
+	sta APUIO1		; 4 |
+	lda @SPC_DATA+$80,x	; 5 |
+	sta APUIO2		; 4 |
+	lda @SPC_DATA+$C0,x	; 5 |
+	sta APUIO3		; 4 |
+	tya			; 2 >> 38 cycles
+-
+	cmp APUIO3		; 4 |
+	bne -			; 3 |
+	dex			; 2 |
+	dey			; 2 |
+	bpl inner_transfer_loop	; 3 >> 14 cycles
+
+	rep #$21 : .al		; 3 |
+	txa			; 2 |
+	adc #$140		; 3 |
+	tax			; 2 |
+	sep #$20 : .as		; 3 |
+	cpx #$003f		; 3 |
+	bne outer_transfer_loop	; 3 >> 19 cycles
+
+	rts
+
+;---------------------------------------
+upload_low_ram:
+
+; ---- Upload $0002-$00EF using IPL
+
+	ldy #$0002
+	jsr spc_begin_upload
+
+	ldx #$0002
+-
+	lda @SPC_DATA,x
+	jsr spc_upload_byte
+	inx
+	cpx #$00F0
+	bne -
+	rts
+;---------------------------------------
+; Executes final restoration code
+restore_final:
+	jsr start_exec_io ; prepare execution from I/O registers
+
+	stz $420d	; SPC700 I/O code requires SLOW timing
+
+; ---- Restore first two bytes of RAM
+
+	lda @SPC_DATA
+	xba
+	lda #$e8	; MOV A,#@SPC_DATA
+	tax
+	jsr exec_instr
+	ldx #$00C4	; MOV $00,A
+	jsr exec_instr
+
+	lda @SPC_DATA+1
+	xba
+	lda #$e8	; MOV A,#@SPC_DATA+1
+	tax
+	jsr exec_instr
+	ldx #$01C4	; MOV $01,A
+	jsr exec_instr
+
+; ---- Restore SP
+
+	lda @SPC_HEADER+43
+	sec
+	sbc #3
+	xba
+	lda #$cd	; MOV X,#@SPC_HEADER+43
+	tax
+	jsr exec_instr
+	ldx #$bd	; MOV SP,X
+	jsr exec_instr
+
+; ---- Restore X
+
+	lda @SPC_HEADER+40
+	xba
+	lda #$cd	; MOV X,#@SPC_HEADER+40
+	tax
+	jsr exec_instr
+
+; ---- Restore Y
+
+	lda @SPC_HEADER+41
+	xba
+	lda #$8d	; MOV Y,#@SPC_HEADER+41
+	tax
+	jsr exec_instr
+
+; ---- Restore DSP FLG register
+
+	lda @SPC_DSP_REGS+$6c
+	xba
+	lda #$e8	; MOV A,#@SPC_DSP_REGS+$6c
+	tax
+	jsr exec_instr
+	ldx #$f3C4	; MOV $f3,A -> $f2 has been set-up before by SPC700 loader
+	jsr exec_instr
+
+; ---- wait a bit (the newer S-APU takes its time to ramp up the volume)
+	lda #$10
+-	pha
+	jsr waitblank
+	pla
+	dec
+	bne -
+
+; ---- Restore DSP KON register
+
+	lda #$4C
+	xba
+	lda #$e8	; MOV A,#$4c
+	tax
+	jsr exec_instr
+	ldx #$f2C4	; MOV $f2,A
+	jsr exec_instr
+	lda @SPC_DSP_REGS+$4C
+	xba
+	lda #$e8	; MOV A,#@SPC_DSP_REGS+$4c
+	tax
+	jsr exec_instr
+	ldx #$f3C4	; MOV $f3,A
+	jsr exec_instr
+
+; ---- Restore DSP register address
+
+ 	lda @SPC_DATA+$F2
+	xba
+	lda #$e8	; MOV A,#@SPC_DATA+$F2
+	tax
+	jsr exec_instr
+	ldx #$f2C4	; MOV dest,A
+	jsr exec_instr
+
+; ---- Restore CONTROL register
+
+	lda @SPC_DATA+$F1
+	and #$CF	; don't clear input ports
+	xba
+	lda #$e8	; MOV A,#@SPC_DATA+$F1
+	tax
+	jsr exec_instr
+	ldx #$f1C4  	; MOV $F1,A
+	jsr exec_instr
+
+;---- Restore A
+
+	lda @SPC_HEADER+39
+	xba
+	lda #$e8	; MOV A,#@SPC_HEADER+39
+	tax
+	jsr exec_instr
+
+;---- Restore PSW and PC
+
+	ldx #$7F00	; NOP; RTI
+	stx APUIO0
+	lda #$FC	; Patch loop to execute instruction just written
+	sta APUIO3
+
+;---- restore IO ports $f4 - $f7
+
+	rep #$20 : .al
+	lda @SPC_DATA+$F4
+	tax
+	lda @SPC_DATA+$F6
+	sta APUIO2
+	stx APUIO0	; last to avoid overwriting RETI before run
+	sep #$20 : .as
+
+	lda #$01
+	sta $420d	; restore FAST CPU operation
+	rts
+;---------------------------------------
+spc_begin_upload:
+
+	sty APUIO2	; Set address
+
+	ldy #$BBAA	; Wait for SPC
+-
+	cpy APUIO0
+	bne -
+
+	lda #$CC	; Send acknowledgement
+	sta APUIO1
+	sta APUIO0
+
+-       		; Wait for acknowledgement
+	cmp APUIO0
+	bne -
+
+	ldy #0		; Initialize index
+	rts
+;---------------------------------------
+spc_upload_byte:
+	sta APUIO1
+
+	tya		; Signal it's ready
+	sta APUIO0
+-     			; Wait for acknowledgement
+	cmp APUIO0
+	bne -
+
+	iny
+
+	rts
+;---------------------------------------
+spc_next_upload:
+	sty APUIO2
+
+; Send command
+; Special case operation has been fully tested.
+	lda APUIO0
+	inc
+	inc
+	bne +
+	inc
++
+	sta APUIO1
+	sta APUIO0
+
+; Wait for acknowledgement
+-
+	cmp APUIO0
+	bne -
+
+	ldy #0
+	rts
+;---------------------------------------
+spc_execute:
+	sty APUIO2
+
+	stz APUIO1
+
+	lda APUIO0
+	inc
+	inc
+	sta APUIO0
+
+; Wait for acknowledgement
+-
+	cmp APUIO0
+	bne -
+
+	rts
+;---------------------------------------
+start_exec_io:
+; Set execution address
+	ldx #$00F5
+	stx APUIO2
+
+	stz APUIO1      ; NOP
+	ldx #$FE2F      ; BRA *-2
+
+; Signal to SPC that we're ready
+	lda APUIO0
+	inc
+	inc
+	sta APUIO0
+
+; Wait for acknowledgement
+-
+	cmp APUIO0
+	bne -
+
+; Quickly write branch
+	stx APUIO2
+
+	rts
+;---------------------------------------
+exec_instr:
+; Replace instruction
+	stx APUIO0
+	lda #$FC
+	sta APUIO3      ; 30
+
+        ; SPC BRA loop takes 4 cycles, so it reads
+        ; the branch offset every 4 SPC cycles (84 master).
+        ; We must handle the case where it read just before
+        ; the write above, and when it reads just after it.
+        ; If it reads just after, we have at least 7 SPC
+        ; cycles (147 master) to change restore the branch
+        ; offset.
+
+        ; 48 minimum, 90 maximum
+        ora #0
+        ora #0
+        ora #0
+        nop
+        nop
+        nop
+
+        ; 66 delay, about the middle of the above limits
+	phd ;4
+	pld ;5
+
+        ; Give plenty of extra time if single execution
+        ; isn't needed, as this avoids such tight timing
+        ; requirements.
+
+;	phd ;4
+;	pld ;5
+;	phd ;4
+;	pld ;5
+
+        ; Patch loop to skip first two bytes
+	lda #$FE        ; 16
+	sta APUIO3      ; 30
+
+        ; 38 minimum (assuming 66 delay above)
+	phd ; 4
+	pld ; 5
+
+        ; Give plenty of extra time if single execution
+        ; isn't needed, as this avoids such tight timing
+        ; requirements.
+
+	phd
+	pld
+	phd
+	pld
+	rts

snes/sysinfo.a65

@@ -35,11 +35,19 @@ show_sysinfo:
 	sta window_h
 	jsr draw_window
 	stz print_pal
+	
+	ldx #38
+copy_snes_system_text:
+	lda @text_system,x
+	sta @snes_system_config,x
+	dex
+	bpl copy_snes_system_text
+	
 sysinfo_printloop:
 	sep #$20 : .as
 	rep #$10 : .xl
 	lda #CMD_SYSINFO
-	sta @AVR_CMD
+	sta @MCU_CMD
 	lda #^SYSINFO_BLK
 	ldx #!SYSINFO_BLK
 	sta print_bank
@@ -51,7 +59,7 @@ sysinfo_printloop:
 	sta print_x
 	lda #40
 	sta print_count
-	lda #13
+	lda #12
 -	pha
 	jsr hiprint
 	inc print_y
@@ -64,6 +72,41 @@ sysinfo_printloop:
 	pla
 	dec
 	bne -
+	
+	ldx #24
+	lda $213e
+	and #$0f
+	clc
+	adc #$30
+	sta @snes_system_config,x
+	
+	ldx #38
+	lda $213f
+	and #$0f
+	clc
+	adc #$30
+	sta @snes_system_config,x
+	
+	ldx #10
+	lda $4210
+	and #$0f
+	clc
+	adc #$30
+	sta @snes_system_config,x		
+	
+	lda #^snes_system_config		; System text
+	ldx #!snes_system_config
+	sta print_bank
+	stx print_src
+	stz print_pal
+	lda #39
+	sta print_count
+	lda #23
+	sta print_y
+	lda #12
+	sta print_x
+	jsr hiprint		
+	
 -	lda isr_done
 	lsr
 	bcc -
@@ -87,5 +130,5 @@ sysinfo_printloop:
 +	plp
 	jsr restore_screen
 	lda #$00
-	sta @AVR_CMD
+	sta @MCU_CMD
 	rtl

snes/text.a65

@@ -1,146 +1,95 @@
 .text
 #include "memmap.i65"
 .byt "===HIPRINT==="
+; input:
+; print_count
+; print_x
+; print_y
+; print_src
+; print_bank
+; print_pal
+;
+; output:
+; print_done (# of chars printed)
+; print_over (char after print_count)
+
 hiprint:
+	php
 	sep #$20 : .as
-	lda print_count
-	sta print_count_tmp
-	stz print_over
-	rep #$30 : .xl : .al
-	stz print_done
-	lda print_x
-	and #$00ff
-	lsr
-	bcs print_bg1
-	ldx #!BG1_TILE_BUF ; for 2nd loop
-	phx
-	ldx #!BG2_TILE_BUF ; for 1st loop
-	phx
-	bra print_bg_cont
-print_bg1
-	ldx #!BG2_TILE_BUF+2 ; for 2nd loop
-	phx
-	ldx #!BG1_TILE_BUF ; for 1st loop da whoop
-	phx
-	bra print_bg_cont
-print_bg_cont
-	sta !print_temp
-	lda !print_y
-	and #$00ff
-	asl
-	asl
-	asl
-	asl
-	asl
-	clc
-	adc !print_temp
-	asl ; double the offset for WRAM addressing
-	tay	; zonday
-	plx
-	phy	; offset from tilemap start
-	stx !print_temp
-	clc
-	adc !print_temp
-; we need to transfer to WRAM and from there to VRAM via DMA during VBLANK
-; because VRAM can only be accessed during VBLANK and forced blanking.
-	sta $2181
-	sep #$20 : .as
-	lda #$7f ;we really only need bit 0. full bank given for clarity
-	sta $2183
-print_loop
-	ldx !print_src
-	lda !print_bank
-	pha
-	plb
-	phx	; source addr
-print_loop_inner
-	lda !0,x
-	bne +
-	jmp print_end2
-+	asl
-	sta @$2180
-	lda @print_pal
-	asl
-	asl
-	adc #$00
-	ora #$20
-	sta @$2180
-	lda @print_done
-	inc
-	sta @print_done
-	inx
-	lda !0,x
-	beq print_loop2
-	inx
-	lda !0,x
-	beq print_loop2
-	lda @print_count_tmp
-	dec
-	dec
-	sta @print_count_tmp
-	beq print_loop2
-	bmi print_loop2
-	bra print_loop_inner
-print_loop2
-	lda @print_count
-	dec
-	sta @print_count_tmp
-	beq print_end2
-	lda #$00
+	rep #$10 : .xl
+	ldx print_src
+	stx print_ptr
+	lda print_bank
+	sta print_ptr+2
+	phb
+	lda #$7e
 	pha
 	plb
 	rep #$30 : .al : .xl
-	ply	; source addr
-	iny
-	pla	; offset from tilemap start
-	plx	; other tilemap addr
-	stx !print_temp
+	lda print_pal
+	and #$00ff
+	xba
+	asl
+	asl
+	ora #$2000
+	sta print_temp
+	lda print_count
+	and #$00ff
+	beq hiprint_end
+	tay
+	lda print_x
+	and #$00ff
+	sta print_x
+	lda print_y
+	and #$00ff
+	asl
+	asl
+	asl
+	asl
+	asl
+	asl
 	clc
-	adc !print_temp ; tilemap+offset
-	sta $2181
-	tyx
+	adc print_x
+	and #$fffe
+	tax
+	lda print_x
+	lsr
+	bcs hiprint_bg1
+hiprint_bg2
+	lda [print_ptr]
+	and #$00ff
+	beq hiprint_end
+	inc print_ptr
+	asl
+	ora print_temp
+	sta !BG2_TILE_BUF, x
+	dey
+	beq hiprint_end
+hiprint_bg1
+	lda [print_ptr]
+	and #$00ff
+	beq hiprint_end
+	inc print_ptr
+	asl
+	ora print_temp
+	sta !BG1_TILE_BUF, x
+	inx
+	inx
+	dey
+	beq hiprint_end
+	bra hiprint_bg2
+hiprint_end
+	plb
 	sep #$20 : .as
-	lda print_bank
-	pha
-	plb
-print_loop2_inner
-	lda !0,x
-	bne +
-	jmp print_end
-+	asl
-	sta @$2180
-	lda @print_pal
-	asl
-	asl
-	adc #$00
-	ora #$20
-	sta @$2180
-	lda @print_done
+	lda [print_ptr]
+	sta print_over
+	tya
+	sec
+	sbc print_count
+	eor #$ff
 	inc
-	sta @print_done
-	inx
-	lda !0,x
-	beq print_end
-	lda @print_count_tmp
-	dec
-	dec
-	sta @print_count_tmp
-	beq print_end
-	bmi print_end
-	inx
-	lda !0,x
-	beq print_end
-	bra print_loop2_inner
-print_end2 ; clean up the stack (6 bytes)
-	ply
-	ply
-	ply
-print_end
-	lda !0,x
-	sta @print_over
-	lda #$00
-	pha
-	plb
+	sta print_done
+	plp
 	rts
 
 
@@ -290,6 +239,7 @@ draw_window:
 	sta print_count
 	jsr hiprint
 	lda print_done
+	clc
 	adc print_x
 	sta print_x
 	lda #^window_tr

snes/time.a65

@@ -499,6 +499,8 @@ time_dec_y1_normal
 	rts
 
 gettime
+	php
+	sep #$20 : .as
 	lda #$0d
 	sta $2801
 	lda $2800
@@ -526,6 +528,7 @@ gettime
 	sta time_y10
 	lda $2800
 	sta time_y100
+	plp
 	rts
 
 rendertime
@@ -677,31 +680,31 @@ is_leapyear_400th
 
 settime
 	lda time_y100
-	sta @AVR_PARAM
+	sta @MCU_PARAM
 	lda time_y10
-	sta @AVR_PARAM+1
+	sta @MCU_PARAM+1
 	lda time_y1
-	sta @AVR_PARAM+2
+	sta @MCU_PARAM+2
 	lda time_mon
-	sta @AVR_PARAM+3
+	sta @MCU_PARAM+3
 	lda time_d10
-	sta @AVR_PARAM+4
+	sta @MCU_PARAM+4
 	lda time_d1
-	sta @AVR_PARAM+5
+	sta @MCU_PARAM+5
 	lda time_h10
-	sta @AVR_PARAM+6
+	sta @MCU_PARAM+6
 	lda time_h1
-	sta @AVR_PARAM+7
+	sta @MCU_PARAM+7
 	lda time_m10
-	sta @AVR_PARAM+8
+	sta @MCU_PARAM+8
 	lda time_m1
-	sta @AVR_PARAM+9
+	sta @MCU_PARAM+9
 	lda time_s10
-	sta @AVR_PARAM+10
+	sta @MCU_PARAM+10
 	lda time_s1
-	sta @AVR_PARAM+11
+	sta @MCU_PARAM+11
 	lda #$02 ; set clock
-	sta @AVR_CMD
+	sta @MCU_CMD
 	rts
 
 printtime:

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
+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
 
 # usbcontrol.c usb_hid.c usbhw_lpc.c usbinit.c usbstdreq.c
 
@@ -75,7 +75,7 @@ ASRC = startup.S crc.S
 #     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
 # Use s -mcall-prologues when you really need size...
 #OPT = 2
-OPT = 2
+OPT = s
 
 # Debugging format.
 DEBUG = dwarf-2
@@ -124,7 +124,8 @@ NM = $(ARCH)-nm
 REMOVE = rm -f
 COPY = cp
 AWK = awk
-
+RLE = ../utils/rle
+BIN2H = utils/bin2h
 
 #---------------- Compiler Options ----------------
 #  -g*:          generate debugging information
@@ -197,7 +198,7 @@ ALL_ASFLAGS = -I. -x assembler-with-cpp $(ASFLAGS) $(CDEFS)
 # Default target.
 all: build
 
-build: elf bin hex
+build: snesboot.h cfgware.h elf bin hex
 	$(E) "  SIZE   $(TARGET).elf"
 	$(Q)$(ELFSIZE)|grep -v debug
 	cp $(TARGET).bin $(OBJDIR)/firmware.img
@@ -217,19 +218,37 @@ sym: $(TARGET).sym
 
 program: build
 	utils/lpcchksum $(TARGET).bin
-	openocd -f openocd-usb.cfg -f lpc1754.cfg -f flash.cfg
+	openocd -f interface/olimex-arm-usb-ocd.cfg  -f lpc1754.cfg -f flash.cfg
 
 debug: build
-	openocd -f openocd-usb.cfg -f lpc1754.cfg
+	openocd -f interface/olimex-arm-usb-ocd.cfg  -f lpc1754.cfg
 
 reset:
-	openocd -f openocd-usb.cfg -f lpc1754.cfg -f reset.cfg
+	openocd -f interface/olimex-arm-usb-ocd.cfg  -f lpc1754.cfg -f reset.cfg
 
 # Display size of file.
 HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex
 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
+	$(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
@@ -302,6 +321,7 @@ clean_list :
 	$(Q)$(REMOVE) $(TARGET).sym
 	$(Q)$(REMOVE) $(TARGET).lss
 	$(Q)$(REMOVE) $(OBJ)
+	$(Q)$(REMOVE) cfgware.h
 	$(Q)$(REMOVE) $(OBJDIR)/autoconf.h
 	$(Q)$(REMOVE) $(OBJDIR)/*.bin
 	$(Q)$(REMOVE) $(LST)

src/README

@@ -25,6 +25,7 @@ b) Cortex M3 toolchain
     - libexpat-dev
     - make
     - gcc
+   Package names may differ for your distribution.
    Newer gccs complain when compiling binutils, so you may have to add
    '--disable-werror' to the compiler options for binutils in the Makefile.
    The Makefile will install immediately so make sure you can write to the

src/bootldr/bits.h

@@ -4,14 +4,14 @@
 /* The classic macro */
 #define BV(x) (1<<(x))
 
-/* CM3 bit-band access macro - no error checks! */
-#define BITBAND(addr,bit) \
+/* CM3 bit-bang access macro - no error checks! */
+#define BITBANG(addr,bit) \
     (*((volatile unsigned long *)( \
                                    ((unsigned long)&(addr) & 0x01ffffff)*32 + \
                                    (bit)*4 + 0x02000000 + ((unsigned long)&(addr) & 0xfe000000) \
                                  )))
 
-#define BITBAND_OFF(addr,offset,bit) \
+#define BITBANG_OFF(addr,offset,bit) \
     (*((volatile unsigned long *)( \
                                    (((unsigned long)&(addr) + offset) & 0x01ffffff)*32 + \
                                    (bit)*4 + 0x02000000 + (((unsigned long)&(addr) + offset) & 0xfe000000) \

src/bootldr/ccsbcs.c

@@ -31,7 +31,8 @@
 #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,
@@ -53,7 +54,8 @@ 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,
@@ -75,7 +77,8 @@ 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,
@@ -97,7 +100,8 @@ 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,
@@ -119,7 +123,8 @@ 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,
@@ -141,7 +146,8 @@ 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,
@@ -163,7 +169,8 @@ 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,
@@ -185,7 +192,8 @@ 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,
@@ -207,7 +215,8 @@ 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,
@@ -229,7 +238,8 @@ 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,
@@ -251,7 +261,8 @@ 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,
@@ -273,7 +284,8 @@ 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,
@@ -295,7 +307,8 @@ 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,
@@ -317,7 +330,8 @@ 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,
@@ -339,7 +353,8 @@ 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,
@@ -361,7 +376,8 @@ 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,
@@ -383,7 +399,8 @@ 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,
@@ -405,7 +422,8 @@ 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,
@@ -427,7 +445,8 @@ 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,
@@ -449,7 +468,8 @@ 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,
@@ -471,7 +491,8 @@ 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,
@@ -506,18 +527,29 @@ 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 {		/* Unicode to OEMCP */
-			for (c = 0; c < 0x80; c++) {
-				if (src == Tbl[c]) break;
     }
-			c = (c + 0x80) & 0xFF;
+    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;
+                }
+            }
+
+            c = ( c + 0x80 ) & 0xFF;
         }
     }
 
@@ -534,7 +566,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;
 }

src/bootldr/clock.c

@@ -7,17 +7,19 @@
 #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
@@ -26,17 +28,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
@@ -47,61 +49,74 @@ 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;
 }

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

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 " strftime() "\n" \
+  print "// autoconf.h generated from " ARGV[1] " at NOW\n" \
     "#ifndef AUTOCONF_H\n" \
     "#define AUTOCONF_H"
 }

src/bootldr/config.h

@@ -27,12 +27,12 @@
 #define IN_AHBRAM                 __attribute__ ((section(".ahbram")))
 
 #define SD_DT_INT_SETUP()         do {\
-                                    BITBAND(LPC_GPIOINT->IO2IntEnR, SD_DT_BIT) = 1;\
-                                    BITBAND(LPC_GPIOINT->IO2IntEnF, SD_DT_BIT) = 1;\
+        BITBANG(LPC_GPIOINT->IO2IntEnR, SD_DT_BIT) = 1;\
+        BITBANG(LPC_GPIOINT->IO2IntEnF, SD_DT_BIT) = 1;\
     } while(0)
 
-#define SD_CHANGE_DETECT          (BITBAND(LPC_GPIOINT->IO2IntStatR, SD_DT_BIT)\
-                                   |BITBAND(LPC_GPIOINT->IO2IntStatF, SD_DT_BIT))
+#define SD_CHANGE_DETECT          (BITBANG(LPC_GPIOINT->IO2IntStatR, SD_DT_BIT)\
+                                   |BITBANG(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             (!(BITBAND(SD_DT_REG->FIOPIN, SD_DT_BIT)))
-#define SDCARD_WP                 (BITBAND(SD_WP_REG->FIOPIN, SD_WP_BIT))
+#define SDCARD_DETECT             (!(BITBANG(SD_DT_REG->FIOPIN, SD_DT_BIT)))
+#define SDCARD_WP                 (BITBANG(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
@@ -55,7 +55,8 @@
 //#define CONFIG_CPU_FREQUENCY      46000000
 #define CONFIG_UART_PCLKDIV       1
 #define CONFIG_UART_TX_BUF_SHIFT  8
-#define CONFIG_UART_BAUDRATE      921600
+//#define CONFIG_UART_BAUDRATE      921600
+#define CONFIG_UART_BAUDRATE      115200
 #define CONFIG_UART_DEADLOCKABLE
 
 #define SSP_CLK_DIVISOR_FAST 2

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)

src/bootldr/crc32.c

@@ -26,17 +26,19 @@
  * \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;
 }
 
@@ -49,23 +51,31 @@ 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;
 }
 

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;
 }
 
 

src/bootldr/diskio.h

@@ -16,7 +16,8 @@
 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 */
@@ -35,7 +36,8 @@ 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;
@@ -48,17 +50,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 };

src/bootldr/faulthandler.c

@@ -2,21 +2,26 @@
 #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 );
 }
 

src/bootldr/ff.h

@@ -229,7 +229,8 @@ 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;
@@ -268,7 +269,8 @@ 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) */
@@ -304,8 +306,9 @@ 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;
@@ -316,10 +319,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) */
@@ -333,17 +336,18 @@ 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;
@@ -352,7 +356,8 @@ typedef struct {
 
 /* File status structure (FILINFO) */
 
-typedef struct {
+typedef struct
+{
     DWORD   fsize;          /* File size */
     WORD    fdate;          /* Last modified date */
     WORD    ftime;          /* Last modified time */
@@ -360,7 +365,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;
@@ -369,7 +374,8 @@ 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 */
@@ -397,49 +403,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_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
@@ -457,25 +464,25 @@ TCHAR* f_gets (TCHAR*, int, FIL*);					/* Get a string from the file */
 
 /* 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
 
 

src/bootldr/fileops.c

@@ -12,38 +12,46 @@ 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;
 }
 
@@ -56,13 +64,17 @@ 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;
 }
 
@@ -74,11 +86,19 @@ 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++];
 }

src/bootldr/fileops.h

@@ -29,24 +29,25 @@
 #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;
-FIL file_handle;
-FRESULT file_res;
-uint8_t file_lfn[258];
-uint16_t file_block_off, file_block_max;
-enum filestates file_status;
+#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;
 
-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

src/bootldr/iap.c

@@ -12,197 +12,284 @@ 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)) 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');
+
+        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('w');
-      if((res = iap_ram2flash(flash_addr, file_buf, 512)) != CMD_SUCCESS) {
-        DBG_BL 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( 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' );
                 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);
-  } else {
-    DBG_UART uart_putc('n');
-    DBG_BL printf("flash content is ok, no version mismatch, no forced upgrade. No need to flash\n");
+
+        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" );
+    }
+
     return ERR_OK;
 }

src/bootldr/iap.h

@@ -2,28 +2,30 @@
 #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;
@@ -31,10 +33,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

src/bootldr/led.c

@@ -18,73 +18,85 @@ int led_writeledstate = 0;
    write  red    P1.23 PWM1[4]
 */
 
-void rdyled(unsigned int state) {
-  BITBAND(LPC_GPIO2->FIODIR, 4) = state;
+void rdyled( unsigned int state )
+{
+    BITBANG( LPC_GPIO2->FIODIR, 4 ) = state;
     led_rdyledstate = state;
 }
 
-void readled(unsigned int state) {
-  BITBAND(LPC_GPIO2->FIODIR, 5) = state;
+void readled( unsigned int state )
+{
+    BITBANG( LPC_GPIO2->FIODIR, 5 ) = state;
     led_readledstate = state;
 }
 
-void writeled(unsigned int state) {
-  BITBAND(LPC_GPIO1->FIODIR, 23) = state;
+void writeled( unsigned int state )
+{
+    BITBANG( 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() {
-  BITBAND(LPC_PINCON->PINSEL4, 9) = 0;
-  BITBAND(LPC_PINCON->PINSEL4, 8) = 0;
+void led_std()
+{
+    BITBANG( LPC_PINCON->PINSEL4, 9 ) = 0;
+    BITBANG( LPC_PINCON->PINSEL4, 8 ) = 0;
 
-  BITBAND(LPC_PINCON->PINSEL4, 11) = 0;
-  BITBAND(LPC_PINCON->PINSEL4, 10) = 0;
+    BITBANG( LPC_PINCON->PINSEL4, 11 ) = 0;
+    BITBANG( LPC_PINCON->PINSEL4, 10 ) = 0;
 
-  BITBAND(LPC_PINCON->PINSEL3, 15) = 0;
-  BITBAND(LPC_PINCON->PINSEL3, 14) = 0;
+    BITBANG( LPC_PINCON->PINSEL3, 15 ) = 0;
+    BITBANG( LPC_PINCON->PINSEL3, 14 ) = 0;
 
-  BITBAND(LPC_PWM1->PCR, 12) = 0;
-  BITBAND(LPC_PWM1->PCR, 13) = 0;
-  BITBAND(LPC_PWM1->PCR, 14) = 0;
+    BITBANG( LPC_PWM1->PCR, 12 ) = 0;
+    BITBANG( LPC_PWM1->PCR, 13 ) = 0;
+    BITBANG( LPC_PWM1->PCR, 14 ) = 0;
 }
 
-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;
+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;
 }

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

src/bootldr/lpc1754.cfg

@@ -27,9 +27,9 @@ if { [info exists CPUTAPID ] } {
 
 #delays on reset lines
 #if your OpenOCD version rejects "jtag_nsrst_delay" replace it with:
-#adapter_nsrst_delay 200
-jtag_nsrst_delay 200
-jtag_ntrst_delay 200
+adapter_nsrst_delay 200
+#jtag_nsrst_delay 200
+#jtag_ntrst_delay 200
 
 # LPC2000 & LPC1700 -> SRST causes TRST
 #reset_config srst_pulls_trst
@@ -56,7 +56,7 @@ flash bank $_FLASHNAME lpc2000 0x0 0x20000 0 0 $_TARGETNAME \
 # Run with *real slow* clock by default since the
 # boot rom could have been playing with the PLL, so
 # we have no idea what clock the target is running at.
-jtag_khz 1000
+adapter_khz 1000
 
 $_TARGETNAME configure -event reset-init {
 	# Do not remap 0x0000-0x0020 to anything but the flash (i.e. select

src/bootldr/main.c

@@ -20,83 +20,113 @@
 
 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);
-  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);
+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);
 
     /* 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();
-  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;
+
+    for ( i = 0; i < 20; i++ )
+    {
+        uart_putc( '-' );
+    }
+
+    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;
     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);
-  }
-  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) {
-        toggle_rdy_led();
-        delay_ms(500);
-      }
-    }
-  }
-  NVIC_DisableIRQ(RIT_IRQn);
-  NVIC_DisableIRQ(UART_IRQ);
+    FLASH_RES res = flash_file( ( uint8_t * )"/sd2snes/firmware.img" );
 
-  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');
+    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 );
+    }
+
+    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 );
+            }
+        }
+    }
+
+    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' );
     chain();
-  while(1);
+
+    while ( 1 );
 }
 

src/bootldr/openocd-usb.cfg

@@ -5,8 +5,14 @@
 #
 
 interface ft2232
-ft2232_vid_pid 0x0403 0x6010
-ft2232_device_desc "Dual RS232"
-ft2232_layout "oocdlink"
-ft2232_latency 2
+ft2232_vid_pid 0x15ba 0x0003
+ft2232_device_desc "Olimex OpenOCD JTAG"
+ft2232_layout "olimex-jtag"
+
+
+#interface ft2232
+#ft2232_vid_pid 0x0403 0x6010
+#ft2232_device_desc "Dual RS232"
+#ft2232_layout "oocdlink"
+#ft2232_latency 2
 #adapter_khz 10

src/bootldr/power.c

@@ -15,12 +15,13 @@
    * 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)
                     ;
 }

src/bootldr/power.h

@@ -38,6 +38,6 @@
 #define PCQEI   (18)
 #define PCGPIO  (15)
 
-void power_init(void);
+void power_init( void );
 
 #endif

src/bootldr/printf.c

@@ -62,24 +62,29 @@ 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;
@@ -87,27 +92,38 @@ static int internal_nprintf(void (*output_function)(char c), const char *fmt, va
 
     outlength = 0;
 
-  while (*fmt) {
-    while (1) {
-      if (*fmt == 0)
+    while ( *fmt )
+    {
+        while ( 1 )
+        {
+            if ( *fmt == 0 )
+            {
                 goto end;
-
-      if (*fmt == '%') {
-        fmt++;
-        if (*fmt != '%')
-          break;
             }
 
-      output_function(*fmt++);
+            if ( *fmt == '%' )
+            {
+                fmt++;
+
+                if ( *fmt != '%' )
+                {
+                    break;
+                }
+            }
+
+            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;
@@ -126,36 +142,44 @@ static int internal_nprintf(void (*output_function)(char c), const char *fmt, va
                 }
             }
 
-      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;
             }
 
@@ -163,9 +187,11 @@ static int internal_nprintf(void (*output_function)(char c), const char *fmt, va
         }
 
         /* Numbers */
-    switch (*fmt) {
+        switch ( *fmt )
+        {
         case 'u':
             flags |= FLAG_UNSIGNED;
+
         case 'd':
             base = 10;
             break;
@@ -176,9 +202,10 @@ static int internal_nprintf(void (*output_function)(char c), const char *fmt, va
             break;
 
         case 'p': // pointer
-      output_function('0');
-      output_function('x');
+            output_function( '0' );
+            output_function( 'x' );
             width -= 2;
+
         case 'x':
         case 'X':
             base = 16;
@@ -188,60 +215,90 @@ static int internal_nprintf(void (*output_function)(char c), const char *fmt, va
 
         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--;
             }
         }
@@ -249,52 +306,69 @@ static int internal_nprintf(void (*output_function)(char c), const char *fmt, va
         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

src/bootldr/timer.c

@@ -1,5 +1,4 @@
 /* ___INGO___ */
-
 #include <arm/NXP/LPC17xx/LPC17xx.h>
 #include "bits.h"
 #include "config.h"
@@ -18,39 +17,42 @@ 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 */
-  BITBAND(LPC_SC->PCONP, PCRIT) = 1;
+    BITBANG( LPC_SC->PCONP, PCRIT ) = 1;
 
     /* clear RIT mask */
     LPC_RIT->RIMASK = 0; /*xffffffff;*/
 
     /* PCLK = CCLK */
-  BITBAND(LPC_SC->PCLKSEL1, 26) = 1;
-  BITBAND(LPC_SC->PCLKSEL1, PCLK_TIMER3) = 1;
+    BITBANG( LPC_SC->PCLKSEL1, 26 ) = 1;
+    BITBANG( 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 (!(BITBAND(LPC_RIT->RICTRL, RITINT))) ;
+    while ( !( BITBANG( 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 ( !( BITBANG( LPC_RIT->RICTRL, RITINT ) ) ) ;
 
     /* Disable RIT */
     LPC_RIT->RICTRL = 0;

src/bootldr/timer.h

@@ -13,7 +13,8 @@ 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;
 }
 
@@ -39,13 +40,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

src/bootldr/uart.c

@@ -75,128 +75,179 @@
 }
 */
 //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_putc( char c )
+{
+    if ( c == '\n' )
+    {
+        uart_putc( '\r' );
+    }
+
+    while ( !( UART_REGS->LSR & ( 0x20 ) ) );
 
-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 (!(BITBAND(UART_REGS->LSR, 0))) ;
+    while ( !( BITBANG( 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 BITBANG( 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;
+    BITBANG( 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 )
+    {
+        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;
     }
 
     /* set baud rate - no fractional stuff for now */
-  UART_REGS->LCR = BV(7) | 3; // always 8n1
-  div = 0x850004; // baud2divisor(CONFIG_UART_BAUDRATE);
+    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;
-  BITBAND(UART_REGS->LCR, 7) = 0;
+    UART_REGS->DLM = ( div >> 8 ) & 0xff;
+    BITBANG( 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;
-  for(i=0;i<len;i+=16) {
+    data += start;
 
-    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(' ');
+    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_putc(' ');
+            else
+            {
+                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( ' ' );
+        }
+
+        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++ );
     }
 }

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 */

src/ccsbcs.c

@@ -31,7 +31,8 @@
 #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,
@@ -53,7 +54,8 @@ 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,
@@ -75,7 +77,8 @@ 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,
@@ -97,7 +100,8 @@ 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,
@@ -119,7 +123,8 @@ 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,
@@ -141,7 +146,8 @@ 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,
@@ -163,7 +169,8 @@ 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,
@@ -185,7 +192,8 @@ 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,
@@ -207,7 +215,8 @@ 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,
@@ -229,7 +238,8 @@ 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,
@@ -251,7 +261,8 @@ 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,
@@ -273,7 +284,8 @@ 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,
@@ -295,7 +307,8 @@ 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,
@@ -317,7 +330,8 @@ 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,
@@ -339,7 +353,8 @@ 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,
@@ -361,7 +376,8 @@ 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,
@@ -383,7 +399,8 @@ 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,
@@ -405,7 +422,8 @@ 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,
@@ -427,7 +445,8 @@ 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,
@@ -449,7 +468,8 @@ 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,
@@ -471,7 +491,8 @@ 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,
@@ -506,18 +527,29 @@ 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 {		/* Unicode to OEMCP */
-			for (c = 0; c < 0x80; c++) {
-				if (src == Tbl[c]) break;
     }
-			c = (c + 0x80) & 0xFF;
+    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;
+                }
+            }
+
+            c = ( c + 0x80 ) & 0xFF;
         }
     }
 
@@ -534,7 +566,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;
 }

src/cfg.c

@@ -0,0 +1,72 @@
+#include "cfg.h"
+#include "config.h"
+#include "uart.h"
+#include "fileops.h"
+
+cfg_t CFG =
+{
+    .cfg_ver_maj = 1,
+    .cfg_ver_min = 0,
+    .last_game_valid = 0,
+    .vidmode_menu = VIDMODE_AUTO,
+    .vidmode_game = VIDMODE_AUTO,
+    .pair_mode_allowed = 0,
+    .bsx_use_systime = 0,
+    .bsx_time = 0x0619970301180530LL
+};
+
+int cfg_save()
+{
+    int err = 0;
+    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 err = 0;
+    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 err = 0;
+    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 err = 0;
+    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 )
+{
+    CFG.last_game_valid = valid;
+}
+
+uint8_t cfg_is_last_game_valid()
+{
+    return CFG.last_game_valid;
+}

src/cfg.h

@@ -0,0 +1,41 @@
+#ifndef _CFG_H
+#define _CFG_H
+
+#include <stdint.h>
+
+#define CFG_FILE ((const uint8_t*)"/sd2snes/sd2snes.cfg")
+#define LAST_FILE ((const uint8_t*)"/sd2snes/lastgame.cfg")
+
+typedef enum
+{
+    VIDMODE_AUTO = 0,
+    VIDMODE_60,
+    VIDMODE_50
+} cfg_vidmode_t;
+
+typedef struct _cfg_block
+{
+    uint8_t cfg_ver_maj;
+    uint8_t cfg_ver_min;
+    uint8_t last_game_valid;
+    uint8_t vidmode_menu;
+    uint8_t vidmode_game;
+    uint8_t pair_mode_allowed;
+    uint8_t bsx_use_systime;
+    uint64_t bsx_time;
+} cfg_t;
+
+int cfg_save( void );
+int cfg_load( void );
+
+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 );
+
+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

src/cic.c

@@ -7,74 +7,108 @@
 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;
     }
 }
 

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

src/cli.c

@@ -42,6 +42,7 @@
 #include "fileops.h"
 #include "memory.h"
 #include "snes.h"
+#include "tests.h"
 #include "fpga.h"
 #include "fpga_spi.h"
 #include "cic.h"
@@ -53,161 +54,214 @@
 #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\0resume\0loadrom\0loadraw\0saveraw\0put\0rm\0d4\0vmode\0mapper\0settime\0time\0setfeature\0hexdump\0w8\0w16\0";
-enum { CMD_CD = 0, CMD_RESET, CMD_SRESET, CMD_DIR, CMD_LS, CMD_TEST, CMD_RESUME, CMD_LOADROM, CMD_LOADRAW, CMD_SAVERAW, CMD_PUT, CMD_RM, CMD_D4, CMD_VMODE, CMD_MAPPER, CMD_SETTIME, CMD_TIME, CMD_SETFEATURE, CMD_HEXDUMP, CMD_W8, CMD_W16 };
+    "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 };
 
 /* ------------------------------------------------------------------------- */
 /*   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;
-  char *cur, *ptr;
-  char c;
+    unsigned char *cur, *ptr;
+    unsigned char c;
 
     i = 0;
-  ptr = 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
-        uart_putc(c);
+                else
+                {
+                    printf( "\n " );
+                }
+            }
+            else
+            {
+                uart_putc( c );
+            }
         }
     }
 
-  while (1) {
-    cur = 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(c) != tolower(*cur)) {
+            if ( tolower( ( int )c ) != tolower( ( int )*cur ) )
+            {
                 // Check for end-of-word
-        if (cur != 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 = 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;
 }
@@ -218,273 +272,391 @@ 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",name);
+        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);
-  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");
-  } else {
-    hz = parse_unsigned(50,60,10);
-    if(hz==50) {
-      cic_d4(CIC_PAL);
-    } else {
-      cic_d4(CIC_NTSC);
+    if ( get_cic_state() != CIC_PAIR )
+    {
+        printf( "not in pair mode\n" );
     }
-    printf("ok\n");
+    else
+    {
+        hz = parse_unsigned( 50, 60, 10 );
+
+        if ( hz == 50 )
+        {
+            cic_d4( CIC_PAL );
+        }
+        else
+        {
+            cic_d4( CIC_NTSC );
+        }
+
+        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");
-  } else {
-    hz = parse_unsigned(50,60,10);
-    if(hz==50) {
-      cic_videomode(CIC_PAL);
-    } else {
-      cic_videomode(CIC_NTSC);
+
+    if ( get_cic_state() != CIC_PAIR )
+    {
+        printf( "not in pair mode\n" );
     }
-    printf("ok\n");
+    else
+    {
+        hz = parse_unsigned( 50, 60, 10 );
+
+        if ( hz == 50 )
+        {
+            cic_videomode( CIC_PAL );
+        }
+        else
+        {
+            cic_videomode( CIC_NTSC );
+        }
+
+        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);
-    } else {
-      printf("OK, start xmodem transfer now.\n");
-      xmodem_rxfile(&file_handle);
+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 );
+        }
+
         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_mapper(void) {
+void cmd_mkdir( void )
+{
+    FRESULT res = f_mkdir( curchar );
+
+    if ( res )
+    {
+        printf( "Error %d creating directory %s\n", res, curchar );
+    }
+}
+
+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 {
-    snes_reset(1);
-    delay_ms(20);
-    snes_reset(0);
+        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 );
 }
 
 /* ------------------------------------------------------------------------- */
 /*   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);
-      } else {
-        printf("Ok.\n");
+            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("cd not supported.\n");
+            printf( "cd not supported.\n" );
             res;
 #endif
             break;
+
         case CMD_RESET:
             cmd_reset();
             break;
@@ -498,7 +670,7 @@ void cli_loop(void) {
             cmd_show_directory();
             break;
 
-    case CMD_RESUME:
+        case CMD_EXIT:
             return;
             break;
 
@@ -518,6 +690,10 @@ void cli_loop(void) {
             cmd_rm();
             break;
 
+        case CMD_MKDIR:
+            cmd_mkdir();
+            break;
+
         case CMD_D4:
             cmd_d4();
             break;
@@ -561,7 +737,15 @@ void cli_loop(void) {
         case CMD_W16:
             cmd_w16();
             break;
-    }
+
+        case CMD_MEMSET:
+            cmd_memset();
+            break;
+
+        case CMD_MEMTEST:
+            test_mem();
+            break;
 
         }
+    }
 }

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

src/clock.c

@@ -7,17 +7,19 @@
 #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
@@ -26,17 +28,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
@@ -47,63 +49,74 @@ void clock_init() {
        done
      */
     enableMainOsc();
-  setClkSrc(CLKSRC_MAINOSC);
-// XXX  setPLL0MultPrediv(429, 19);
-// XXX  setPLL0MultPrediv(23, 2);
-  setPLL0MultPrediv(12, 1);
+    setClkSrc( CLKSRC_MAINOSC );
+    setPLL0MultPrediv( 22, 1 );
     enablePLL0();
-  setCCLKDiv(3);
+    setCCLKDiv( 6 );
     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;
 }

src/clock.h

@@ -49,31 +49,29 @@
 #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 PLL0feed(void);
-
-void setClkSrc(uint8_t src);
+void disableMainOsc( void );
 
+void PLL0feed( void );
 
+void setClkSrc( uint8_t src );
 #endif

src/config

@@ -1,4 +1,4 @@
-CONFIG_VERSION="0.1.3"
+CONFIG_VERSION="0.1.5"
 #FWVER=00010300
-CONFIG_FWVER=66304
+CONFIG_FWVER=0x00010500
 CONFIG_MCU_FOSC=12000000

src/config.h

@@ -35,18 +35,15 @@
 
 #define CONFIG_UART_NUM           3
 // #define CONFIG_CPU_FREQUENCY      90315789
-#define CONFIG_CPU_FREQUENCY      96000000
+#define CONFIG_CPU_FREQUENCY      88000000
 //#define CONFIG_CPU_FREQUENCY      46000000
 #define CONFIG_UART_PCLKDIV       1
 #define CONFIG_UART_TX_BUF_SHIFT  8
-#define CONFIG_UART_BAUDRATE      921600
+//#define CONFIG_UART_BAUDRATE      921600
+#define CONFIG_UART_BAUDRATE      115200
 #define CONFIG_UART_DEADLOCKABLE
 
-#define SSP_CLK_DIVISOR_FAST 2
-#define SSP_CLK_DIVISOR_SLOW 250
-
-#define SSP_CLK_DIVISOR_FPGA_FAST 6
-#define SSP_CLK_DIVISOR_FPGA_SLOW 20
+#define SSP_CLK_DIVISOR           2
 
 #define SNES_RESET_REG            LPC_GPIO1
 #define SNES_RESET_BIT            26
@@ -67,7 +64,11 @@
 #define FPGA_MCU_RDY_BIT          9
 
 #define QSORT_MAXELEM             2048
+#define SORT_STRLEN               256
 #define CLTBL_SIZE        100
+
+#define DIR_FILE_MAX              16380
+
 #define SSP_REGS LPC_SSP0
 #define SSP_PCLKREG PCLKSEL1
 // 1: PCLKSEL0

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)

src/crc16.c

@@ -20,7 +20,8 @@
 /**
  * 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,
@@ -63,11 +64,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;
 }
 

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" */

src/crc32.c

@@ -22,7 +22,8 @@
 /**
  * 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,
@@ -97,12 +98,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;
 }

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;
 }

src/diskio.h

@@ -16,7 +16,8 @@
 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 */
@@ -35,7 +36,8 @@ 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;
@@ -48,16 +50,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
-#define disk_ioctl(a,b,c) RES_OK
+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 };

src/faulthandler.c

@@ -1,20 +1,25 @@
 #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 );
 }
 

src/ff.h

@@ -229,7 +229,8 @@ 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;
@@ -268,7 +269,8 @@ 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) */
@@ -304,8 +306,9 @@ 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;
@@ -316,10 +319,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) */
@@ -333,17 +336,18 @@ 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;
@@ -352,7 +356,8 @@ typedef struct {
 
 /* File status structure (FILINFO) */
 
-typedef struct {
+typedef struct
+{
     DWORD   fsize;          /* File size */
     WORD    fdate;          /* Last modified date */
     WORD    ftime;          /* Last modified time */
@@ -360,7 +365,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;
@@ -369,7 +374,8 @@ 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 */
@@ -397,50 +403,51 @@ 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
@@ -458,25 +465,25 @@ TCHAR* f_gets (TCHAR*, int, FIL*);					/* Get a string from the file */
 
 /* 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
 
 

src/fileops.c

@@ -37,81 +37,113 @@ 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++];
 }

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

src/filetypes.c

@@ -31,36 +31,47 @@
 #include "ff.h"
 #include "smc.h"
 #include "fileops.h"
-#include "crc32.h"
+#include "crc.h"
 #include "memory.h"
 #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;
+    static uint32_t crc, fncrc;
     static uint32_t db_tgt;
     static uint32_t next_subdir_tgt;
     static uint32_t parent_tgt;
@@ -69,6 +80,7 @@ uint32_t scan_dir(char* path, FILINFO* fno_param, char mkdb, uint32_t this_dir_t
     static uint16_t num_files_total = 0;
     static uint16_t num_dirs_total = 0;
     uint32_t dir_tgt;
+    uint32_t switched_dir_tgt = 0;
     uint16_t numentries;
     uint32_t dirsize;
     uint8_t pass = 0;
@@ -76,246 +88,376 @@ uint32_t scan_dir(char* path, FILINFO* fno_param, char mkdb, uint32_t this_dir_t
     char *size_units[3] = {" ", "k", "M"};
     uint32_t entry_fsize;
     uint8_t entry_unit_idx;
+    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 < 2; pass++) {
-    if(pass) {
-      num_dirs_total++;
-      dirsize = 4*(numentries);
+    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 );
+                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) {
-//        printf("d=%d Saving %lx to Address %lx  [end]\n", depth, 0L, next_subdir_tgt - 4);
-        sram_writelong(0L, next_subdir_tgt - 4);
+
+            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 );
             }
         }
-    if(fno_param) {
-      res = dir_open_by_filinfo(&dir, fno_param);
-    } else {
-      res = f_opendir(&dir, path);
+
+        if ( fno_param )
+        {
+            res = dir_open_by_filinfo( &dir, fno_param );
         }
-    if (res == FR_OK) {
-      if(pass && parent_tgt && mkdb) {
+        else
+        {
+            res = f_opendir( &dir, path );
+        }
+
+        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);
-      for (;;) {
-//        toggle_read_led();
-        res = f_readdir(&dir, &fno);
-        if (res != FR_OK || fno.fname[0] == 0) {
-          if(pass) {
-            if(!numentries) was_empty=1;
+
+            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;*/
                     }
+
                     break;
                 }
+
                 fn = *fno.lfname ? fno.lfname : fno.fname;
-        if ((*fn == '.') || !(memcmp(fn, SYS_DIR_NAME, sizeof(SYS_DIR_NAME)))) continue;
-        if (fno.fattrib & AM_DIR) {
+
+                if ( ( *fn == '.' ) || !( strncasecmp( fn, SYS_DIR_NAME, sizeof( SYS_DIR_NAME ) ) ) )
+                {
+                    continue;
+                }
+
+                if ( fno.fattrib & AM_DIR )
+                {
                     depth++;
-          if(depth < FS_MAX_DEPTH) {
+
+                    if ( depth < FS_MAX_DEPTH )
+                    {
                         numentries++;
-            if(pass) {
-              path[len]='/';
-              strncpy(path+len+1, (char*)fn, sizeof(fs_path)-len);
-              if(mkdb) {
-                uint16_t pathlen = strlen(path);
-//                printf("d=%d Saving %lx to Address %lx  [dir]\n", depth, db_tgt, dir_tgt);
+
+                        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 );
+
                                 /* 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 );
                                 }
-//                printf("    Saving dir descriptor to %lx tgt=%lx, path=%s\n", db_tgt, next_subdir_tgt, path);
-                /* write element pointer to current dir structure */
-                sram_writelong((db_tgt-SRAM_MENU_ADDR)|((uint32_t)0x80<<24), dir_tgt);
-                /* save element:
-                   - path name
-                   - pointer to sub dir structure */
-                sram_writelong((next_subdir_tgt-SRAM_MENU_ADDR), db_tgt);
-                sram_writebyte(len+1, db_tgt+sizeof(next_subdir_tgt));
-                sram_writeblock(path, db_tgt+sizeof(next_subdir_tgt)+sizeof(len), pathlen);
-                sram_writeblock("/\0", 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_dir(path, &fno, mkdb, next_subdir_tgt);
-              dir_tgt += 4;
-              was_empty = 0;
-            }
-          }
-          depth--;
-          path[len]=0;
-        } else {
-          SNES_FTYPE type = determine_filetype((char*)fn);
-          if(type != TYPE_UNKNOWN) {
-            num_files_total++;
-            numentries++;
-            if(pass) {
-              if(mkdb) {
-/*                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:
-/*                    file_open_by_filinfo(&fno);
-                    if(file_res){
-                      printf("ZOMG NOOOO %d\n", file_res);
-                    }
-                    smc_id(&romprops);
-                    file_close(); */
 
                                 /* 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);
+                                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;
+                            }
+
+                            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 );
+                            }
+
+                            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 );
+                        }
+                    }
+
+                    depth--;
+                    path[len] = 0;
+                }
+                else
+                {
+                    SNES_FTYPE type = determine_filetype( ( char * )fn );
+
+                    if ( type != TYPE_UNKNOWN )
+                    {
+                        numentries++;
+
+                        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 )
+                                {
+                                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 );
                                         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);
+
+                                path[len] = 0;
+                                /*              printf("%s ", path);
                                                 _delay_ms(30); */
                             }
-            } else {
-              TCHAR* fn2 = fn;
-              while(*fn2 != 0) {
-                crc += crc32_update(crc, *((unsigned char*)fn2++));
+                        }
+                        else
+                        {
+                            TCHAR *fn2 = fn;
+                            fncrc = 0;
+
+                            while ( *fn2 != 0 )
+                            {
+                                fncrc += crc_xmodem_update( fncrc, *( ( unsigned char * )fn2++ ) );
+                            }
+
+                            crc += fncrc;
                         }
                     }
                 }
-/*        printf("%s/%s\n", path, fn);
-          _delay_ms(50); */
             }
         }
-    } 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);
+    }
+
+    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;
-  }
-  /* later
-  if(!strcasecmp_P(ext+1, PSTR("SRM"))) {
-    return TYPE_SRM;
-  }
-  if(!strcasecmp_P(ext+1, PSTR("SPC"))) {
-    return TYPE_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;
     }
 }

src/filetypes.h

@@ -36,8 +36,9 @@
 #include "ff.h"
 
 #define FS_MAX_DEPTH    (10)
-#define SYS_DIR_NAME	((const uint8_t*)"sd2snes")
-typedef enum {
+#define SYS_DIR_NAME    ((const char*)"sd2snes")
+typedef enum
+{
     TYPE_UNKNOWN = 0, /* 0 */
     TYPE_SMC,         /* 1 */
     TYPE_SRM,         /* 2 */
@@ -47,12 +48,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

src/fpga.c

@@ -52,147 +52,208 @@
 #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;
 
-  SPI_OFFLOAD=0;
-  fpga_set_cclk(0);    /* initial clk=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;
+
+    do
+    {
+        i = 0;
         timeout = getticks() + 100;
-    fpga_set_prog_b(0);
-if(BITBAND(PROGBREG->FIOPIN, PROGBBIT)) {
-  printf("PROGB is stuck high!\n");
+        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");
+        }
+
+        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");
+
+        if ( fpga_get_done() )
+        {
+            printf( "DONE is stuck high!\n" );
             led_panic();
         }
-    LPC_GPIO2->FIOMASK1 = ~(BV(0));
-    uart_putc('p');
+
+        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');
 
-    for (;;) {
+        uart_putc( 'C' );
+
+        for ( ;; )
+        {
             data = rle_file_getc();
             i++;
-      if (file_status || file_res) break;   /* error or eof */
-      FPGA_SEND_BYTE_SERIAL(data);
+
+            if ( file_status || file_res )
+            {
+                break;    /* error or eof */
             }
-    uart_putc('c');
+
+            FPGA_SEND_BYTE_SERIAL( data );
+        }
+
+        uart_putc( 'c' );
         file_close();
-    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);
+        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();
     }
-  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");
+        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();
             }
         };
-    if(fpga_get_done()) {
-      printf("DONE is stuck high!\n");
+
+        if ( fpga_get_done() )
+        {
+            printf( "DONE is stuck high!\n" );
             led_panic();
         }
-    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;
-      i++;
-      FPGA_SEND_BYTE_SERIAL(data);
+
+            if ( rle_state )
+            {
+                break;
             }
-    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);
+
+            i++;
+            FPGA_SEND_BYTE_SERIAL( data );
+        }
+
+        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();
     }
-  printf("FPGA configured\n");
+
+    printf( "FPGA configured\n" );
     fpga_postinit();
 }
 

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)

src/fpga_spi.c

@@ -1,6 +1,6 @@
 /* sd2snes - SD card based universal cartridge for the SNES
-   Copyright (C) 2009-2010 Maximilian Rehkopf <otakon@gmx.net>
-   AVR firmware portion
+   Copyright (C) 2009-2012 Maximilian Rehkopf <otakon@gmx.net>
+   uC firmware portion
 
    Inspired by and based on code from sd2iec, written by Ingo Korb et al.
    See sdcard.c|h, config.h.
@@ -142,287 +142,292 @@
 #include "timer.h"
 #include "sdnative.h"
 
-void fpga_spi_init(void) {
-  spi_init(SPI_SPEED_FAST);
-  BITBAND(FPGA_MCU_RDY_REG->FIODIR, FPGA_MCU_RDY_BIT) = 0;
+void fpga_spi_init( void )
+{
+    spi_init();
+    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(0x02);
-  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(0x01);
-  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(0x00);
-  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(0x20);
-  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(0x10);
-  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(0x30 | (val & 0x0f));
+    FPGA_TX_BYTE( FPGA_CMD_SETMAPPER( val ) );
     FPGA_DESELECT();
 }
 
-uint8_t fpga_test() {
+uint8_t fpga_test()
+{
     FPGA_SELECT();
-  FPGA_TX_BYTE(0xF0); /* TEST */
-  FPGA_TX_BYTE(0x00); /* dummy */
+    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(0xF1); /* STATUS */
-  FPGA_TX_BYTE(0x00); /* dummy */
-  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) {
+void fpga_set_sddma_range( uint16_t start, uint16_t end )
+{
+    printf( "%s %08X -> %08X\n", __func__, start, end );
     FPGA_SELECT();
-  FPGA_TX_BYTE(0x60); /* DMA_RANGE */
-  FPGA_TX_BYTE(start>>8);
-  FPGA_TX_BYTE(start&0xff);
-  FPGA_TX_BYTE(end>>8);
-  FPGA_TX_BYTE(end&0xff);
-//if(tgt==1 && (test=FPGA_RX_BYTE()) != 0x41) printf("!!!!!!!!!!!!!!! -%02x- \n", test);
+    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) {
-  uint32_t test = 0;
-  uint8_t status = 0;
-  BITBAND(SD_CLKREG->FIODIR, SD_CLKPIN) = 0;
+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;
     FPGA_SELECT();
-  FPGA_TX_BYTE(0x40 | (tgt & 0x3) | ((partial & 1) << 2) ); /* DO DMA */
-  FPGA_TX_BYTE(0x00); /* dummy for falling DMA_EN edge */
-//if(tgt==1 && (test=FPGA_RX_BYTE()) != 0x41) printf("!!!!!!!!!!!!!!! -%02x- \n", test);
+    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(0xF1); /* STATUS */
-  FPGA_TX_BYTE(0x00); /* dummy */
-  DBG_SD printf("FPGA DMA request sent, wait for completion...");
-  while((status=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 */
-    test++;
     }
-  DBG_SD printf("...complete\n");
+
+    DBG_SD printf( "...complete\n" );
     FPGA_DESELECT();
-//  if(test<5)printf("loopy: %ld %02x\n", test, status);
-  BITBAND(SD_CLKREG->FIODIR, SD_CLKPIN) = 1;
+    BITBAND( SD_CLKREG->FIODIR, SD_CLKPIN ) = 1;
 }
 
-void set_dac_vol(uint8_t volume) {
+void dac_play()
+{
     FPGA_SELECT();
-  FPGA_TX_BYTE(0x50);
-  FPGA_TX_BYTE(volume);
-  FPGA_TX_BYTE(0x00); /* latch rise */
-  FPGA_TX_BYTE(0x00); /* latch fall */
+    FPGA_TX_BYTE( FPGA_CMD_DACPLAY );
+    FPGA_TX_BYTE( 0x00 ); /* latch reset */
     FPGA_DESELECT();
 }
 
-void dac_play() {
+void dac_pause()
+{
     FPGA_SELECT();
-  FPGA_TX_BYTE(0xe2);
-  FPGA_TX_BYTE(0x00); /* latch reset */
+    FPGA_TX_BYTE( FPGA_CMD_DACPAUSE );
+    FPGA_TX_BYTE( 0x00 ); /* latch reset */
     FPGA_DESELECT();
 }
 
-void dac_pause() {
+void dac_reset()
+{
     FPGA_SELECT();
-  FPGA_TX_BYTE(0xe1);
-  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 dac_reset() {
+void msu_reset( uint16_t address )
+{
     FPGA_SELECT();
-  FPGA_TX_BYTE(0xe3);
-  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 msu_reset(uint16_t address) {
+void set_msu_status( uint8_t set, uint8_t reset )
+{
     FPGA_SELECT();
-  FPGA_TX_BYTE(0xe4);
-  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_MSUSETBITS );
+    FPGA_TX_BYTE( set );
+    FPGA_TX_BYTE( reset );
+    FPGA_TX_BYTE( 0x00 ); /* latch reset */
     FPGA_DESELECT();
 }
 
-void set_msu_status(uint8_t set, uint8_t reset) {
+uint16_t get_msu_track()
+{
     FPGA_SELECT();
-  FPGA_TX_BYTE(0xe0);
-  FPGA_TX_BYTE(set);
-  FPGA_TX_BYTE(reset);
-  FPGA_TX_BYTE(0x00); /* latch reset */
-  FPGA_DESELECT();
-}
-
-uint8_t get_msu_volume() {
-  FPGA_SELECT();
-  FPGA_TX_BYTE(0xF4); /* MSU_VOLUME */
-  FPGA_TX_BYTE(0x00); /* dummy */
-  uint8_t result = FPGA_RX_BYTE();
-  FPGA_DESELECT();
-  return result;
-}
-
-uint16_t get_msu_track() {
-  FPGA_SELECT();
-  FPGA_TX_BYTE(0xF3); /* MSU_TRACK */
-  FPGA_TX_BYTE(0x00); /* dummy */
-  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(0xF2); /* MSU_OFFSET */
-  FPGA_TX_BYTE(0x00); /* dummy */
-  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(0xFE); /* GET_SYSCLK */
-  FPGA_TX_BYTE(0x00); /* dummy */
-  FPGA_TX_BYTE(0x00); /* dummy */
-  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(0xe6);
-  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(0xe5);
-  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(0xe7);
-  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(0xe8);
-  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(0xe9);
-  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(0xea);
-  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 ? 0xeb : 0xec);
-  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(0xed);
-  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(0xee);
-  FPGA_TX_BYTE(data);
+    FPGA_TX_BYTE( FPGA_CMD_SET213F );
+    FPGA_TX_BYTE( data );
     FPGA_DESELECT();
 }
 

src/fpga_spi.h

@@ -47,9 +47,6 @@
 #define FPGA_TX_BLOCK(x,y) spi_tx_block(x,y)
 #define FPGA_RX_BLOCK(x,y) spi_rx_block(x,y)
 
-#define FPGA_SPI_FAST()    spi_set_speed(SPI_SPEED_FPGA_FAST)
-#define FPGA_SPI_SLOW()    spi_set_speed(SPI_SPEED_FPGA_SLOW)
-
 #define FEAT_213F          (1 << 4)
 #define FEAT_MSU1          (1 << 3)
 #define FEAT_SRTC          (1 << 2)
@@ -60,37 +57,73 @@
 
 #define FPGA_WAIT_RDY()    do {while(BITBAND(SSP_REGS->SR, SSP_BSY)); while(!BITBAND(FPGA_MCU_RDY_REG->FIOPIN, FPGA_MCU_RDY_BIT));} while (0)
 
-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 set_dac_vol(uint8_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);
-uint8_t get_msu_volume(void);
-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);
+/* command parameters */
+#define FPGA_MEM_AUTOINC        (0x8)
+#define FPGA_SDDMA_PARTIAL      (0x4)
+#define FPGA_TGT_MEM      (0x0)
+#define FPGA_TGT_DACBUF   (0x1)
+#define FPGA_TGT_MSUBUF   (0x2)
+
+/* commands */
+#define FPGA_CMD_SETADDR        (0x00)
+#define FPGA_CMD_SETROMMASK     (0x10)
+#define FPGA_CMD_SETRAMMASK     (0x20)
+#define FPGA_CMD_SETMAPPER(x)   (0x30 | (x & 15))
+#define FPGA_CMD_SDDMA          (0x40)
+#define FPGA_CMD_SDDMA_RANGE    (0x60)
+#define FPGA_CMD_READMEM        (0x80)
+#define FPGA_CMD_WRITEMEM       (0x90)
+#define FPGA_CMD_MSUSETBITS     (0xe0)
+#define FPGA_CMD_DACPAUSE       (0xe1)
+#define FPGA_CMD_DACPLAY        (0xe2)
+#define FPGA_CMD_DACRESETPTR    (0xe3)
+#define FPGA_CMD_MSUSETPTR      (0xe4)
+#define FPGA_CMD_RTCSET         (0xe5)
+#define FPGA_CMD_BSXSETBITS     (0xe6)
+#define FPGA_CMD_SRTCRESET      (0xe7)
+#define FPGA_CMD_DSPRESETPTR    (0xe8)
+#define FPGA_CMD_DSPWRITEPGM    (0xe9)
+#define FPGA_CMD_DSPWRITEDAT    (0xea)
+#define FPGA_CMD_DSPRESET       (0xeb)
+#define FPGA_CMD_DSPUNRESET     (0xec)
+#define FPGA_CMD_SETFEATURE     (0xed)
+#define FPGA_CMD_SET213F        (0xee)
+#define FPGA_CMD_TEST           (0xf0)
+#define FPGA_CMD_GETSTATUS      (0xf1)
+#define FPGA_CMD_MSUGETADDR     (0xf2)
+#define FPGA_CMD_MSUGETTRACK    (0xf3)
+#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 );
 #endif

src/irq.c

@@ -4,9 +4,12 @@
 #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();
     }

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,127 +22,156 @@ int led_pwmstate = 0;
    write  red    P1.23 PWM1[4]
 */
 
-void rdyled(unsigned int state) {
-  if(led_pwmstate) {
-    rdybright(state?15:0);
-  } else {
-    BITBAND(LPC_GPIO2->FIODIR, 4) = state;
+void rdyled( unsigned int state )
+{
+    if ( led_pwmstate )
+    {
+        rdybright( state ? 15 : 0 );
     }
+    else
+    {
+        BITBAND( LPC_GPIO2->FIODIR, 4 ) = state;
+    }
+
     led_rdyledstate = state;
 }
 
-void readled(unsigned int state) {
-  if(led_pwmstate) {
-    readbright(state?15:0);
-  } else {
-    BITBAND(LPC_GPIO2->FIODIR, 5) = state;
+void readled( unsigned int state )
+{
+    if ( led_pwmstate )
+    {
+        readbright( state ? 15 : 0 );
     }
+    else
+    {
+        BITBAND( LPC_GPIO2->FIODIR, 5 ) = state;
+    }
+
     led_readledstate = state;
 }
 
-void writeled(unsigned int state) {
-  if(led_pwmstate) {
-    writebright(state?15:0);
-  } else {
-    BITBAND(LPC_GPIO1->FIODIR, 23) = state;
+void writeled( unsigned int state )
+{
+    if ( led_pwmstate )
+    {
+        writebright( state ? 15 : 0 );
     }
+    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()
+{
     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( 1 );
+        readled( 1 );
+        writeled( 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;
 }

src/lpc1754.cfg

@@ -27,8 +27,8 @@ if { [info exists CPUTAPID ] } {
 
 #delays on reset lines
 #if your OpenOCD version rejects "jtag_nsrst_delay" replace it with:
-#adapter_nsrst_delay 200
-jtag_nsrst_delay 200
+adapter_nsrst_delay 200
+#jtag_nsrst_delay 200
 jtag_ntrst_delay 200
 
 # LPC2000 & LPC1700 -> SRST causes TRST
@@ -39,7 +39,8 @@ 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_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)
 # and 16K more on AHB, in the ARMv7-M "SRAM" area, (at 0x2007c000).
@@ -56,7 +57,7 @@ flash bank $_FLASHNAME lpc2000 0x0 0x20000 0 0 $_TARGETNAME \
 # Run with *real slow* clock by default since the
 # boot rom could have been playing with the PLL, so
 # we have no idea what clock the target is running at.
-jtag_khz 1000
+adapter_khz 1000
 
 $_TARGETNAME configure -event reset-init {
 	# Do not remap 0x0000-0x0020 to anything but the flash (i.e. select

src/main.c

@@ -48,284 +48,414 @@ extern volatile int reset_changed;
 
 extern volatile cfg_t CFG;
 
-enum system_states {
+enum system_states
+{
     SYS_RTC_STATUS = 0,
     SYS_LAST_STATUS = 1
 };
 
-int main(void) {
-  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);
+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 );
 
     /* 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(); /* 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           */
+
 
-  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();
-  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);
+    /* Output FPGA clock */
+    LPC_PINCON->PINSEL0 |= BV( 20 ) | BV( 21 );              /* MAT3.0 (FPGA clock) */
 
+    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->CTCR=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) {
-    if(disk_state == DISK_CHANGED) {
-      sdn_init();
+    sram_writebyte( 0, SRAM_CMD_ADDR );
+
+    while ( 1 ) /* Main loop */
+    {
+        if ( disk_state == DISK_CHANGED )
+        {
+            sdn_init(); /* Reinit SD card */
             newcard = 1;
         }
-    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);
+
+        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 );
         }
-    /* some sanity checks */
-    uint8_t card_go = 0;
-    while(!card_go) {
-      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);
+
+        /* Wait for valid card inserted */
+        card_go = 0;
+
+        while ( !card_go )
+        {
+            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 );
             }
-      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);
-      } else {
+
+            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 );
+            }
+            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);
-    }
-    rdyled(1);
-    readled(0);
-    writeled(0);
 
+        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 );
+
+        /* 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);
 
-    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)) {
+        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 ) )
+        {
             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) {
-	/* 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);
+            if ( ( get_db_id( &saved_dir_id ) != FR_OK ) || saved_dir_id != curr_dir_id )
+            {
                 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);
-	printf("done\n");
-      } else {
-	printf("saved dir id = %lx\n", saved_dir_id);
-	printf("different card, consistent db, loading db...\n");
-	load_sram((uint8_t*)"/sd2snes/sd2snes.db", SRAM_DB_ADDR);
-	load_sram((uint8_t*)"/sd2snes/sd2snes.dir", SRAM_DIR_ADDR);
+                /* 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" );
             }
-      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");
-      load_sram((uint8_t*)"/sd2snes/sd2snes.db", SRAM_DB_ADDR);
-      load_sram((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...     \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_pgm((uint8_t*)"/sd2snes/fpga_base.bit");
-    fpga_dspx_reset(1);
-    uart_putc('(');
-    load_rom((uint8_t*)"/sd2snes/menu.bin", SRAM_MENU_ADDR, 0);
+        fpga_dspx_reset( 1 );
+        uart_putc( '(' );
+        uart_putcrlf();
+        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 );
 
-    if((rtc_state = rtc_isvalid()) != RTC_OK) {
-      printf("RTC invalid!\n");
-      sram_writebyte(0xff, SRAM_STATUS_ADDR+SYS_RTC_STATUS);
-      set_bcdtime(0x20110401000000LL);
-      set_fpga_time(0x20110401000000LL);
+        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 );
             invalidate_rtc();
-    } 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);
-    delay_ms(1);
-    snes_reset(0);
+        else
+        {
+            printf( "RTC valid!\n" );
+            sram_writebyte( 0x00, SRAM_STATUS_ADDR + SYS_RTC_STATUS );
+            set_fpga_time( get_bcdtime() );
+        }
 
-    uint8_t cmd = 0;
-    uint64_t btime = 0;
-    uint32_t filesize=0;
-    sram_writebyte(32, SRAM_CMD_ADDR);
-    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_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 );
+
+        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());
+        //}
         //sram_hexdump(SRAM_DB_ADDR, 0x200);
         //sram_hexdump(SRAM_MENU_ADDR, 0x400);
-    while(!cmd) {
-      cmd=menu_main_loop();
-      printf("cmd: %d\n", cmd);
-      uart_putc('-');
-      switch(cmd) {
+
+        while ( !cmd )
+        {
+            cmd = menu_main_loop();
+            printf( "cmd: %d\n", cmd );
+
+            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);
+                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_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);
-          break;
-	default:
-	  printf("unknown cmd: %d\n", cmd);
-	  cmd=0; /* unknown cmd: stay in loop */
-	  break;
-      }
-    }
-    printf("cmd was %x, going to snes main loop\n", cmd);
 
-    if(romprops.has_msu1 && msu1_loop()) {
+            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 */
+                break;
+
+            case SNES_CMD_RESET:
+                /* process RESET request from SNES */
+                printf( "RESET requested by SNES\n" );
+                snes_reset_pulse();
+                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 );
+                break;
+
+            default:
+                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 );
+
+        if ( romprops.has_msu1 )
+        {
+            while ( !msu1_loop() );
+
             prepare_reset();
             continue;
         }
 
-    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) {
+        cmd = 0;
+        snes_reset_prev = 0;
+        snes_reset_now = 0;
+        snes_reset_state = 0;
+        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("reset\n");
+            printf( "%s ", get_cic_statename( get_cic_state() ) );
+
+            if ( reset_changed )
+            {
+                printf( "reset\n" );
                 reset_changed = 0;
                 fpga_reset_srtc_state();
             }
-      snes_reset_now=get_snes_reset();
-      if(snes_reset_now) {
-	if(!snes_reset_prev) {
-	  printf("RESET BUTTON DOWN\n");
-	  snes_reset_state=1;
-	  reset_count=0;
-	}
-      } else {
-	if(snes_reset_prev) {
-	  printf("RESET BUTTON UP\n");
-	  snes_reset_state=0;
+
+            snes_reset_now = get_snes_reset();
+
+            if ( snes_reset_now )
+            {
+                if ( !snes_reset_prev )
+                {
+                    printf( "RESET BUTTON DOWN\n" );
+                    snes_reset_state = 1;
+                    reset_count = 0;
                 }
             }
-      if(snes_reset_state) {
+            else
+            {
+                if ( snes_reset_prev )
+                {
+                    printf( "RESET BUTTON UP\n" );
+                    snes_reset_state = 0;
+                }
+            }
+
+            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){
+        if ( fpga_test() != FPGA_TEST_TOKEN )
+        {
             led_panic();
         }
+
         /* else reset */
     }
 }

src/memory.h

@@ -30,45 +30,74 @@
 #include <arm/NXP/LPC17xx/LPC17xx.h>
 #include "smc.h"
 
-#define SRAM_ROM_ADDR           (0x000000L)
-#define SRAM_SAVE_ADDR          (0xE00000L)
+#define MASK_BITS                (0x000000)
+#if 0
+#define SRAM_ROM_ADDR           ((0x000000L) & ~MASK_BITS)
+#define SRAM_SAVE_ADDR          ((0x400000L) & ~MASK_BITS)
 
-#define SRAM_MENU_ADDR          (0xE00000L)
-#define SRAM_DB_ADDR            (0xE40000L)
-#define SRAM_DIR_ADDR           (0xE10000L)
-#define SRAM_CMD_ADDR           (0xFF1000L)
-#define SRAM_PARAM_ADDR         (0xFF1004L)
-#define SRAM_STATUS_ADDR        (0xFF1100L)
-#define SRAM_SYSINFO_ADDR       (0xFF1200L)
-#define SRAM_LASTGAME_ADDR      (0xFF1420L)
-#define SRAM_MENU_SAVE_ADDR     (0xFF0000L)
-#define SRAM_SCRATCHPAD         (0xFFFF00L)
-#define SRAM_DIRID              (0xFFFFF0L)
+#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)
+
+#define SRAM_MENU_ADDR          ((0x500000L) & ~MASK_BITS)
+#define SRAM_DIR_ADDR           ((0x510000L) & ~MASK_BITS)
+#define SRAM_DB_ADDR            ((0x580000L) & ~MASK_BITS)
+
+#define SRAM_SPC_DATA_ADDR      ((0x7D0000L) & ~MASK_BITS)
+#define SRAM_SPC_HEADER_ADDR    ((0x7E0000L) & ~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)
+#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_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);
-
+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 );
 #endif

src/msu1.c

@@ -13,227 +13,321 @@
 #include "smc.h"
 
 FIL msufile;
+FRESULT msu_res;
 DWORD msu_cltbl[CLTBL_SIZE] IN_AHBRAM;
 DWORD pcm_cltbl[CLTBL_SIZE] IN_AHBRAM;
+UINT msu_audio_bytes_read = 1024;
+UINT msu_data_bytes_read = 1;
 
 extern snes_romprops_t romprops;
+uint32_t msu_loop_point = 0;
+uint32_t msu_page1_start = 0x0000;
+uint32_t msu_page2_start = 0x2000;
+uint32_t msu_page_size = 0x2000;
+uint16_t fpga_status_prev;
+uint16_t fpga_status_now;
 
-int msu1_check_reset(void) {
-  static tick_t rising_ticks;
+enum msu_reset_state { MSU_RESET_NONE = 0, MSU_RESET_SHORT, MSU_RESET_LONG };
 
-  static uint8_t resbutton=0, resbutton_prev=0;
-  resbutton = get_snes_reset();
-  if(resbutton && !resbutton_prev) { /* push */
-    rising_ticks = getticks();
-  } else if(resbutton && resbutton_prev) { /* hold */
-    if(getticks() > rising_ticks + 99) {
-      return 1;
+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 )
+    {
+        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 );
+        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 );
+        /* 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 */
     }
-  resbutton_prev = resbutton;
-  return 0;
 }
 
-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");
+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 );
+        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 );
+                msu_page2_start = msu_page1_start + msu_page_size;
+                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 );
+                msu_page1_start = msu_page2_start + msu_page_size;
+                DBG_MSU1 printf( "%08lx)\n", msu_page1_start );
+            }
+        }
+        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 );
+}
+
+int msu1_check_reset( void )
+{
+    static tick_t rising_ticks;
+
+    static uint8_t resbutton = 0, resbutton_prev = 0;
+    int result = MSU_RESET_NONE;
+    resbutton = get_snes_reset();
+
+    if ( resbutton && !resbutton_prev ) /* push */
+    {
+        rising_ticks = getticks();
+    }
+    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 )
+        {
+            result = MSU_RESET_SHORT;
+        }
+    }
+    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" );
         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(). */
-  UINT bytes_read = 1024;
-  UINT bytes_read2 = 1;
-  FRESULT res;
-  set_dac_vol(0x00);
-  while(fpga_status() & 0x4000);
-  uint16_t fpga_status_prev = fpga_status();
-  uint16_t fpga_status_now = fpga_status();
+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;
     uint16_t msu_track = 0;
     uint32_t msu_offset = 0;
-  uint32_t msu_loop_point = 0;
+    fpga_status_prev = fpga_status();
+    fpga_status_now = fpga_status();
+    int msu_res;
 
-  uint32_t msu_page1_start = 0x0000;
-  uint32_t msu_page2_start = 0x2000;
-  uint32_t msu_page_size = 0x2000;
-
-  set_msu_addr(0x0);
+    /*  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, &bytes_read2);
-
-  set_dac_addr(dac_addr);
+      f_read(&msufile, file_buf, 16384, &msu_data_bytes_read);
+    */
+    set_dac_addr( dac_addr );
     dac_pause();
     dac_reset();
-/* audio_start, data_start, 0, audio_ctrl[1:0], ctrl_start */
-  while(1){
+
+    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 )
+    {
         cli_entrycheck();
         fpga_status_now = fpga_status();
 
         /* Data buffer refill */
-    if((fpga_status_now & 0x2000) != (fpga_status_prev & 0x2000)) {
-      DBG_MSU1 printf("data\n");
-      uint8_t pageno = 0;
-      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;
-	pageno = 1;
-      } else {
+            }
+            else
+            {
                 msu_addr = 0x2000;
                 msu_page2_start = msu_page1_start + msu_page_size;
-	pageno = 2;
             }
-      set_msu_addr(msu_addr);
-      sd_offload_tgt=2;
-      ff_sd_offload=1;
-      res = f_read(&msufile, file_buf, 8192, &bytes_read2);
-      DBG_MSU1 printf("data buffer refilled. res=%d page1=%08lx page2=%08lx\n", 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. res=%d page1=%08lx page2=%08lx\n", 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;
             }
-      set_dac_addr(dac_addr);
-      sd_offload_tgt=1;
-      ff_sd_offload=1;
-      f_read(&file_handle, file_buf, MSU_DAC_BUFSIZE/2, &bytes_read);
+            else
+            {
+                dac_addr = MSU_DAC_BUFSIZE / 2;
             }
 
-    if(fpga_status_now & 0x0020) {
-      char suffix[11];
+            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 )
+        {
             /* 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 );
 
-      /* open file, fill buffer */
-      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);
-      f_open(&file_handle, (const TCHAR*)file_buf, FA_READ);
-      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, &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, &bytes_read);
-
-      /* clear busy bit */
-      set_msu_status(0x00, 0x20); /* set no bits, reset bit 5 */
+            prepare_audio_track( msu_track );
         }
 
-    if(fpga_status_now & 0x0010) {
+        if ( fpga_status_now & 0x0010 )
+        {
             /* get address */
-      msu_offset=get_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;
-        res = f_lseek(&msufile, msu_offset);
-	DBG_MSU1 printf("seek to %08lx, res = %d\n", msu_offset, res);
-	sd_offload_tgt=2;
-	ff_sd_offload=1;
-
-        res = f_read(&msufile, file_buf, 16384, &bytes_read2);
-	DBG_MSU1 printf("read res = %d\n", res);
-	DBG_MSU1 printf("read %d bytes\n", bytes_read2);
-	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, &bytes_read2);
-	    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);
-	  }
-	} 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, &bytes_read2);
-	    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);
-	  }
-	} 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);
+            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();
             }
         }
@@ -241,28 +335,42 @@ int msu1_loop() {
         fpga_status_prev = fpga_status_now;
 
         /* handle loop / end */
-    if(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) - bytes_read, &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();
             }
-      bytes_read = MSU_DAC_BUFSIZE;
+
+            msu_audio_bytes_read = MSU_DAC_BUFSIZE;
         }
-    if(msu1_check_reset()) {
-      f_close(&msufile);
-      f_close(&file_handle);
+    }
+
+    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" );
+    return 0;
 }
 /* END OF MSU1 STUFF */

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

src/openocd-usb.cfg

@@ -4,9 +4,16 @@
 # http://www.hs-augsburg.de/~hhoegl/proj/usbjtag/usbjtag.html
 #
 
-interface ft2232
-ft2232_vid_pid 0x0403 0x6010
-ft2232_device_desc "Dual RS232"
-ft2232_layout "oocdlink"
-ft2232_latency 2
+#interface ft2232
+interface ftdi
+#ft2232_vid_pid 0x15ba 0x0003
+#ft2232_device_desc "Olimex OpenOCD JTAG"
+#ft2232_layout "olimex-jtag"
+
+
+#interface ft2232
+#ft2232_vid_pid 0x0403 0x6010
+#ft2232_device_desc "Dual RS232"
+#ft2232_layout "oocdlink"
+#ft2232_latency 2
 #adapter_khz 10

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 );
 }

src/power.h

@@ -38,6 +38,6 @@
 #define PCQEI   (18)
 #define PCGPIO  (15)
 
-void power_init(void);
+void power_init( void );
 
 #endif

src/printf.c

@@ -61,24 +61,29 @@ 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;
@@ -86,27 +91,38 @@ static int internal_nprintf(void (*output_function)(char c), const char *fmt, va
 
     outlength = 0;
 
-  while (*fmt) {
-    while (1) {
-      if (*fmt == 0)
+    while ( *fmt )
+    {
+        while ( 1 )
+        {
+            if ( *fmt == 0 )
+            {
                 goto end;
-
-      if (*fmt == '%') {
-        fmt++;
-        if (*fmt != '%')
-          break;
             }
 
-      output_function(*fmt++);
+            if ( *fmt == '%' )
+            {
+                fmt++;
+
+                if ( *fmt != '%' )
+                {
+                    break;
+                }
+            }
+
+            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;
@@ -125,36 +141,44 @@ static int internal_nprintf(void (*output_function)(char c), const char *fmt, va
                 }
             }
 
-      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;
             }
 
@@ -162,9 +186,11 @@ static int internal_nprintf(void (*output_function)(char c), const char *fmt, va
         }
 
         /* Numbers */
-    switch (*fmt) {
+        switch ( *fmt )
+        {
         case 'u':
             flags |= FLAG_UNSIGNED;
+
         case 'd':
             base = 10;
             break;
@@ -175,9 +201,10 @@ static int internal_nprintf(void (*output_function)(char c), const char *fmt, va
             break;
 
         case 'p': // pointer
-      output_function('0');
-      output_function('x');
+            output_function( '0' );
+            output_function( 'x' );
             width -= 2;
+
         case 'x':
         case 'X':
             base = 16;
@@ -187,60 +214,90 @@ static int internal_nprintf(void (*output_function)(char c), const char *fmt, va
 
         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--;
             }
         }
@@ -248,44 +305,52 @@ static int internal_nprintf(void (*output_function)(char c), const char *fmt, va
         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;
 }

src/rle.c

@@ -2,65 +2,92 @@
 #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;
 }

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;

src/rtc.c

@@ -11,23 +11,32 @@ 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;
@@ -35,101 +44,116 @@ 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 );
 }

src/rtc.h

@@ -29,13 +29,15 @@
 
 #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
@@ -50,29 +52,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

src/sdcard.h

@@ -1,46 +0,0 @@
-/* sd2iec - SD/MMC to Commodore serial bus interface/controller
-   Copyright (C) 2007-2010  Ingo Korb <ingo@akana.de>
-
-   Inspiration and low-level SD/MMC access based on code from MMC2IEC
-     by Lars Pontoppidan et al., see sdcard.c|h and config.h.
-
-   FAT filesystem access based on code from ChaN and Jim Brain, see ff.c|h.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License only.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-   sdcard.h: Definitions for the SD/MMC access routines
-
-*/
-
-#ifndef SDCARD_H
-#define SDCARD_H
-
-#include "diskio.h"
-
-#define SD_TX_BYTE(x)		spi_tx_byte(x, SPI_SD);
-#define SD_RX_BYTE(x)		spi_rx_byte(x, SPI_SD);
-#define SD_TX_BLOCK(x,y)	spi_tx_block(x,y, SPI_SD);
-#define SD_RX_BLOCK(x,y)	spi_rx_block(x,y, SPI_SD);
-
-/* These functions are weak-aliased to disk_... */
-void    sd_init(void);
-DSTATUS sd_status(BYTE drv);
-DSTATUS sd_initialize(BYTE drv);
-DRESULT sd_read(BYTE drv, BYTE *buffer, DWORD sector, BYTE count);
-DRESULT sd_write(BYTE drv, const BYTE *buffer, DWORD sector, BYTE count);
-DRESULT sd_getinfo(BYTE drv, BYTE page, void *buffer);
-
-void    sd_changed(void);
-#endif