Commit my latest changes

CHANGELOG

@@ -38,59 +38,3 @@ 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)
-

cic/supercic/supercic-key.asm

@@ -744,4 +744,4 @@ supercic_pairmode_loop
 ; eeprom memory
 DEEPROM	CODE
 	de      0x09	; D411 (NTSC)
-end
+	end

cic/supercic/supercic-lock.asm

@@ -192,11 +192,11 @@ rst_loop
 	clrf	0x59		; clear D4
 	clrf	0x5e		;
 	clrf	0x5f		;
-        banksel EEADR		; fetch current mode from EEPROM
+	banksel EEADR		; fetch current mode from EEPROM
-        clrf    EEADR		; address 0
+	clrf    EEADR		; address 0
-        bsf     EECON1, RD	; 
+	bsf     EECON1, RD	; 
-        movf    EEDAT, w        ; 
+	movf    EEDAT, w        ; 
-        banksel PORTA
+	banksel PORTA
 	movwf	0x55		; store saved mode in mode var
 	movwf	0x56		; and temp LED
 	movwf	0x58		; and forced region

pcb/kicad/RevE2/sd2snes.pro

@@ -1,4 +1,4 @@
-update=Sat 25 Feb 2012 11:51:50 PM CET
+update=ven. 20 avril 2012 18:26:30 CEST
 version=1
 last_client=pcbnew
 [general]
@@ -87,6 +87,7 @@ PadDrlX=0
 PadDimH=197
 PadDimV=276
 BoardThickness=630
+SgPcb45=1
 TxtPcbV=800
 TxtPcbH=600
 TxtModV=600

snes/Makefile

@@ -1,4 +1,4 @@
-OBJS = header.ips reset.o65 main.o65 font.o65 palette.o65 data.o65 const.o65 logo.o65 logospr.o65 text.o65 dma.o65 menu.o65 pad.o65 time.o65 mainmenu.o65 sysinfo.o65 spc700.o65 spcplay.o65 # gfx.o65 # vars.o65
+OBJS = header.ips reset.o65 main.o65 font.o65 palette.o65 data.o65 const.o65 logo.o65 logospr.o65 text.o65 dma.o65 menu.o65 pad.o65 time.o65 mainmenu.o65 sysinfo.o65 # gfx.o65 # vars.o65
 
 all: clean menu.bin map
 

snes/boot/const.a65

@@ -2,8 +2,7 @@ version		.byt "                            v0.1",0
 zero		.word	0
 bg2tile		.byt $20
 
-space64	
+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
 	.byt $20, $20, $20, $20, $20, $20, $20, $20

snes/boot/data.a65

@@ -1,43 +1,41 @@
 .data
 ;don't anger the stack!
 ;----------parameters for text output----------
-print_x         .byt  0  ; x coordinate
+print_x	.byt 0		;x coordinate
-                .byt  0
+	.byt 0
-print_y         .byt  0  ; y coordinate
+print_y	.byt 0		;y coordinate
-                .byt  0
+	.byt 0
-print_src       .word 0  ; source data address
+print_src	.word 0	;source data address
-print_bank      .byt  0  ; source data bank
+print_bank	.byt 0	;source data bank
-print_pal       .word 0  ; palette number for text output
+print_pal	.word 0	;palette number for text output
-print_temp      .word 0  ; work variable
+print_temp	.word 0 ;work variable
-print_count     .byt  0  ; how many characters may be printed?
+print_count	.byt 0	;how many characters may be printed?
-print_count_tmp .byt  0  ; work variable
+print_count_tmp .byt 0	;work variable
-print_done      .word 0  ; how many characters were printed?
+print_done	.word 0  ;how many characters were printed?
 ;----------parameters for dma----------
-dma_a_bank      .byt  0
+dma_a_bank	.byt 0
-dma_a_addr      .word 0
+dma_a_addr	.word 0
-dma_b_reg       .byt  0
+dma_b_reg	.byt 0
-dma_len         .word 0
+dma_len		.word 0
-dma_mode        .byt  0
+dma_mode	.byt 0
 
 ;----------state information----------
-isr_done        .byt  0  ; isr done flag
+isr_done	.byt 0  ; isr done flag
 ;----------menu layout/system constants (224/448)
-textdmasize     .word 0 ; number of bytes to copy each frame
+textdmasize	.word 0 ; number of bytes to copy each frame
 
-infloop         .byt 0,0  ; to be filled w/ 80 FE
+infloop		.byt 0,0  ; to be filled w/ 80 FE
 
-printloop_wram 
+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
+		.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
+		.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
+		.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 
+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
+		.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
+		.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/boot/palette.a65

@@ -1,4 +1,4 @@
 palette
 ;fonts
 	.byt  $42, $08, $ff, $7f, $00, $00, $9c, $73
-    .byt  $42, $08, $ff, $43, $00, $00, $18, $63
+        .byt  $42, $08, $ff, $43, $00, $00, $18, $63

snes/boot/reset.a65

@@ -11,24 +11,24 @@
 
 ; NMI - called on VBlank
 NMI_ROUTINE:
-    sep #$20 : .as
+        sep #$20 : .as
-    rep #$10 : .xl
+	rep #$10 : .xl
-    lda #$00
+	lda #$00
-    pha
+	pha
-    plb
+	plb
-    lda $4210
+        lda $4210
 
-    ldx #BG1_TILE_BASE
+	ldx #BG1_TILE_BASE
-    stx $2116
+	stx $2116
-    DMA0(#$01, #36*64, #^BG1_TILE_BUF, #!BG1_TILE_BUF, #$18)
+	DMA0(#$01, #36*64, #^BG1_TILE_BUF, #!BG1_TILE_BUF, #$18)
 
-    lda #$01
+	lda #$01
-    sta isr_done
+	sta isr_done
-    rtl
+        rtl
 
 ; IRQ - called when triggered
 IRQ_ROUTINE:
-    sep #$20 : .as
+        sep #$20 : .as
-    lda $4211  ;Acknowledge irq
+        lda $4211  ;Acknowledge irq
-    rtl
+        rtl
 

snes/const.a65

@@ -168,24 +168,4 @@ 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_ptr	.byt 0,0,0 ;read pointer
+print_count	.byt 0	;how many characters may be printed?
-print_count	.word 0	;how many characters may be printed?
+print_count_tmp .byt 0	;work variable
 print_done	.word 0 ;how many characters were printed?
 print_over	.byt 0  ;was the string printed incompletely?
 ;----------parameters for dma----------
@@ -183,18 +183,5 @@ direntry_xscroll
 	.word	0
 direntry_xscroll_wait
 	.word	0
-infloop	.byt 0,0  ; to be filled w/ 80 FE
+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,4 +1,21 @@
 
+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
@@ -50,11 +67,8 @@ setup_hdma:
 	sty $4352
 	sta $4354
 
-	lda #$3a
+;	lda #$06
-	sta $420c		;enable HDMA ch. 1+3+4+5
+;	sta $420c		;enable HDMA ch. 1+2
-	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,22 +1,13 @@
-#define hash #
-#define f(x) x
-#define imm(a) f(hash)a
-
 #define DMA0(mode, len, a_bank, a_addr, b_reg)\
-	php \
+	lda mode \
-:	sep imm($20) : .as \
+: 	sta dma_mode \
-:	rep imm($10) : .xl \
-:	lda mode \
-: 	sta $4300 \
 :	ldx a_addr \
 :	lda a_bank \
-:	stx $4302 \
+:	stx dma_a_addr \
-:	sta $4304 \
+:	sta dma_a_bank \
 :	ldx len \
-:	stx $4305 \
+:	stx dma_len \
 :	lda b_reg \
-:	sta $4301 \
+:	sta dma_b_reg \
-:	lda imm($01) \
+:	jsr dma0
-:	sta $420b \
-:	plp
 

snes/main.a65

@@ -4,45 +4,13 @@
 GAME_MAIN:
 	sep #$20 : .as
 	lda #$00
-	sta @MCU_CMD		; clear MCU command register
+	sta @AVR_CMD
 	rep #$20 : .al
 	lda #$0000
-	sta @MCU_PARAM		; clear MCU command parameters
+	sta @AVR_PARAM
-	sta @MCU_PARAM+2
+	sta @AVR_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
@@ -50,11 +18,9 @@ coldboot:							; Regular, cold-start init
 	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 +
@@ -66,93 +32,50 @@ coldboot:							; Regular, cold-start init
 	jmp @infloop	;infinite loop in WRAM
 
 killdma:
-	stz $4300
+	stz $420b
-	stz $4301
+	stz $420c
-	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 $4355
+	stz $4360
-	stz $4356
+	stz $4361
-	stz $4357
+	stz $4362
-	stz $4358
+	stz $4363
-	stz $4359
+	stz $4364
-	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:
@@ -168,11 +91,11 @@ setup_gfx:
 	stz $420b
 	stz $420c
 ;clear tilemap buffers
-	ldx #$8000
+	ldx #$0000
 	stx $2181
-	lda #$00
+	lda #$01
 	sta $2183
-	DMA0(#$08, #$8000, #^zero, #!zero, #$80)
+	DMA0(#$08, #0, #^zero, #!zero, #$80)
 
 ;generate fonts
 	jsr genfonts
@@ -223,7 +146,6 @@ 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
@@ -276,7 +198,7 @@ setup_gfx:
 tests:
 	sep #$20 : .as		;8-bit accumulator
 	rep #$10 : .xl		;16-bit index
-	lda #$03		;mode 3, mode 5 via HDMA
+	lda #$03		;mode 3, mode 5 via HDMA :D
 	sta $2105
 	lda #$58		;Tilemap addr 0xB000
 	ora #$02		;SC size 32x64
@@ -302,17 +224,11 @@ tests:
 	lda #$1f
 	sta $212e
 	sta $212f
-;	stz $2121
+	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
+	sta $2100		;screen on, full brightness
+	lda #9
+	sta bar_yl
 	rts
 
 snes_init:
@@ -332,7 +248,6 @@ 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
@@ -424,7 +339,7 @@ snes_init:
 
 fadeloop:
 	sep #$30 : .as : .xs
-	ldx cur_bright
+	ldx #$0f
 	and #$00
 	pha
 	plb

snes/memmap.i65

@@ -6,24 +6,19 @@
 /* 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	$7EB000
+#define BG1_TILE_BUF	$7FB000
-#define BG2_TILE_BUF	$7EA000
+#define BG2_TILE_BUF	$7FA000
 
-#define BG1_TILE_BAK	$7E9000
+#define BG1_TILE_BAK	$7F9000
-#define BG2_TILE_BAK	$7E8000
+#define BG2_TILE_BAK	$7F8000
 
-#define MCU_CMD		$307000
+#define AVR_CMD		$307000
-#define MCU_PARAM	$307004
+#define AVR_PARAM	$307004
 #define RTC_STATUS	$307100
 #define LAST_STATUS	$307101
 #define SYSINFO_BLK	$307200
@@ -32,9 +27,3 @@
 #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,6 +42,7 @@ menuloop_s1
 	lda isr_done
 	lsr
 	bcc menuloop_s1
+
 	stz isr_done
 	jsr printtime
 	jsr menu_updates	;update stuff, check keys etc
@@ -271,10 +272,6 @@ 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
@@ -505,8 +502,6 @@ 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
@@ -524,28 +519,25 @@ 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 MCU load the rom
+	; have avr load the rom
 	dey
 	rep #$20 : .al
 	lda [dirptr_addr], y
 	and #$00ff
-	sta @MCU_PARAM+2
+	sta @AVR_PARAM+2
 	dey
 	dey
 	lda [dirptr_addr], y
-	sta @MCU_PARAM
+	sta @AVR_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
 
@@ -605,8 +597,6 @@ 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
@@ -645,27 +635,6 @@ 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
@@ -805,7 +774,7 @@ select_last_file:
 	and pad1trig+1
 	beq -
 	lda #$04
-	sta @MCU_CMD
+	sta @AVR_CMD
 	jmp select_file_fade
 +	jsr restore_screen
 	plp
@@ -881,7 +850,6 @@ 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,15 +4,7 @@ read_pad:
 read_pad1
 	ldx pad1mem 	;byetUDLRaxlriiii
 	lda $4218
-	and #$000f
+	ora $421a
-	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,29 +84,9 @@ math_cont
 	clc
 	adc bar_x	; + X start coord
 	sta $2127	; window 1 right
-;	lda #$3e	; ch. 1-5
+	lda #$3e	; ch. 1-5
-;	sta @$420c	; trigger HDMA
+	sta @$420c	; trigger HDMA
-
+	lda #$01
-	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

@@ -1,61 +0,0 @@
-; 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

@@ -1,676 +0,0 @@
-#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,19 +35,11 @@ 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 @MCU_CMD
+	sta @AVR_CMD
 	lda #^SYSINFO_BLK
 	ldx #!SYSINFO_BLK
 	sta print_bank
@@ -59,7 +51,7 @@ sysinfo_printloop:
 	sta print_x
 	lda #40
 	sta print_count
-	lda #12
+	lda #13
 -	pha
 	jsr hiprint
 	inc print_y
@@ -72,41 +64,6 @@ 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 -
@@ -130,5 +87,5 @@ sysinfo_printloop:
 +	plp
 	jsr restore_screen
 	lda #$00
-	sta @MCU_CMD
+	sta @AVR_CMD
 	rtl

snes/text.a65

@@ -1,95 +1,146 @@
 .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
-	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
-	lda print_pal
-	and #$00ff
-	xba
-	asl
-	asl
-	ora #$2000
-	sta print_temp
 	lda print_count
-	and #$00ff
+	sta print_count_tmp
-	beq hiprint_end
+	stz print_over
-	tay
+	rep #$30 : .xl : .al
+	stz print_done
 	lda print_x
 	and #$00ff
-	sta print_x
+	lsr
-	lda print_y
+	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
-	asl
 	clc
-	adc print_x
+	adc !print_temp
-	and #$fffe
+	asl ; double the offset for WRAM addressing
-	tax
+	tay	; zonday
-	lda print_x
+	plx
-	lsr
+	phy	; offset from tilemap start
-	bcs hiprint_bg1
+	stx !print_temp
-hiprint_bg2
+	clc
-	lda [print_ptr]
+	adc !print_temp
-	and #$00ff
+; we need to transfer to WRAM and from there to VRAM via DMA during VBLANK
-	beq hiprint_end
+; because VRAM can only be accessed during VBLANK and forced blanking.
-	inc print_ptr
+	sta $2181
-	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_ptr]
+	lda #$7f ;we really only need bit 0. full bank given for clarity
-	sta print_over
+	sta $2183
-	tya
+print_loop
-	sec
+	ldx !print_src
-	sbc print_count
+	lda !print_bank
-	eor #$ff
+	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
+	sta @print_done
-	plp
+	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
+	pha
+	plb
+	rep #$30 : .al : .xl
+	ply	; source addr
+	iny
+	pla	; offset from tilemap start
+	plx	; other tilemap addr
+	stx !print_temp
+	clc
+	adc !print_temp ; tilemap+offset
+	sta $2181
+	tyx
+	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
+	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
 	rts
 
 
@@ -239,7 +290,6 @@ draw_window:
 	sta print_count
 	jsr hiprint
 	lda print_done
-	clc
 	adc print_x
 	sta print_x
 	lda #^window_tr

snes/time.a65

@@ -499,8 +499,6 @@ time_dec_y1_normal
 	rts
 
 gettime
-	php
-	sep #$20 : .as
 	lda #$0d
 	sta $2801
 	lda $2800
@@ -528,7 +526,6 @@ gettime
 	sta time_y10
 	lda $2800
 	sta time_y100
-	plp
 	rts
 
 rendertime
@@ -680,31 +677,31 @@ is_leapyear_400th
 
 settime
 	lda time_y100
-	sta @MCU_PARAM
+	sta @AVR_PARAM
 	lda time_y10
-	sta @MCU_PARAM+1
+	sta @AVR_PARAM+1
 	lda time_y1
-	sta @MCU_PARAM+2
+	sta @AVR_PARAM+2
 	lda time_mon
-	sta @MCU_PARAM+3
+	sta @AVR_PARAM+3
 	lda time_d10
-	sta @MCU_PARAM+4
+	sta @AVR_PARAM+4
 	lda time_d1
-	sta @MCU_PARAM+5
+	sta @AVR_PARAM+5
 	lda time_h10
-	sta @MCU_PARAM+6
+	sta @AVR_PARAM+6
 	lda time_h1
-	sta @MCU_PARAM+7
+	sta @AVR_PARAM+7
 	lda time_m10
-	sta @MCU_PARAM+8
+	sta @AVR_PARAM+8
 	lda time_m1
-	sta @MCU_PARAM+9
+	sta @AVR_PARAM+9
 	lda time_s10
-	sta @MCU_PARAM+10
+	sta @AVR_PARAM+10
 	lda time_s1
-	sta @MCU_PARAM+11
+	sta @AVR_PARAM+11
 	lda #$02 ; set clock
-	sta @MCU_CMD
+	sta @AVR_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 tests.c
+SRC = main.c ff.c ccsbcs.c clock.c uart.c power.c led.c timer.c printf.c spi.c fileops.c rtc.c fpga.c fpga_spi.c snes.c smc.c memory.c filetypes.c faulthandler.c sort.c crc32.c cic.c cli.c xmodem.c irq.c rle.c sdnative.c msu1.c crc16.c sysinfo.c cfg.c
 
 # usbcontrol.c usb_hid.c usbhw_lpc.c usbinit.c usbstdreq.c
 
@@ -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 = s
+OPT = 2
 
 # Debugging format.
 DEBUG = dwarf-2
@@ -117,6 +117,7 @@ endif
 # CC must be defined here to generate the correct CFLAGS
 SHELL = sh
 CC = $(ARCH)-gcc
+#CC = clang
 OBJCOPY = $(ARCH)-objcopy
 OBJDUMP = $(ARCH)-objdump
 SIZE = $(ARCH)-size
@@ -124,8 +125,6 @@ NM = $(ARCH)-nm
 REMOVE = rm -f
 COPY = cp
 AWK = awk
-RLE = ../utils/rle
-BIN2H = utils/bin2h
 
 #---------------- Compiler Options ----------------
 #  -g*:          generate debugging information
@@ -139,8 +138,10 @@ CFLAGS += $(CDEFS) $(CINCS)
 CFLAGS += -O$(OPT)
 CFLAGS += $(CPUFLAGS) -nostartfiles
 #CFLAGS += -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
-CFLAGS += -Wall -Wstrict-prototypes -Werror
+CFLAGS += -Wall -Wstrict-prototypes
+#-Werror
 CFLAGS += -Wa,-adhlns=$(OBJDIR)/$(<:.c=.lst)
+#CFLAGS += -I/opt/arm-none-eabi-4.6.2/arm-none-eabi/include/
 CFLAGS += -I$(OBJDIR)
 CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 CFLAGS += $(CSTANDARD)
@@ -198,7 +199,7 @@ ALL_ASFLAGS = -I. -x assembler-with-cpp $(ASFLAGS) $(CDEFS)
 # Default target.
 all: build
 
-build: snesboot.h cfgware.h elf bin hex
+build: elf bin hex
 	$(E) "  SIZE   $(TARGET).elf"
 	$(Q)$(ELFSIZE)|grep -v debug
 	cp $(TARGET).bin $(OBJDIR)/firmware.img
@@ -218,37 +219,19 @@ sym: $(TARGET).sym
 
 program: build
 	utils/lpcchksum $(TARGET).bin
-	openocd -f interface/olimex-arm-usb-ocd.cfg  -f lpc1754.cfg -f flash.cfg
+	openocd -f openocd-usb.cfg -f lpc1754.cfg -f flash.cfg
 
 debug: build
-	openocd -f interface/olimex-arm-usb-ocd.cfg  -f lpc1754.cfg
+	openocd -f openocd-usb.cfg -f lpc1754.cfg
 
 reset:
-	openocd -f interface/olimex-arm-usb-ocd.cfg  -f lpc1754.cfg -f reset.cfg
+	openocd -f openocd-usb.cfg -f lpc1754.cfg -f reset.cfg
 
 # Display size of file.
 HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex
 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
@@ -321,7 +304,6 @@ 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,7 +25,6 @@ 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/bits.h

@@ -6,16 +6,16 @@
 
 /* CM3 bit-band access macro - no error checks! */
 #define BITBAND(addr,bit) \
-    (*((volatile unsigned long *)( \
+  (*((volatile unsigned long *)( \
-                                   ((unsigned long)&(addr) & 0x01ffffff)*32 + \
+     ((unsigned long)&(addr) & 0x01ffffff)*32 + \
-                                   (bit)*4 + 0x02000000 + ((unsigned long)&(addr) & 0xfe000000) \
+      (bit)*4 + 0x02000000 + ((unsigned long)&(addr) & 0xfe000000) \
-                                 )))
+  )))
 
 #define BITBAND_OFF(addr,offset,bit) \
-    (*((volatile unsigned long *)( \
+  (*((volatile unsigned long *)( \
-                                   (((unsigned long)&(addr) + offset) & 0x01ffffff)*32 + \
+     (((unsigned long)&(addr) + offset) & 0x01ffffff)*32 + \
-                                   (bit)*4 + 0x02000000 + (((unsigned long)&(addr) + offset) & 0xfe000000) \
+      (bit)*4 + 0x02000000 + (((unsigned long)&(addr) + offset) & 0xfe000000) \
-                                 )))
+  )))
 
 
 #endif

src/bootldr/baudcalc.c

@@ -0,0 +1,80 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include "config.h"
+
+static uint8_t uart_lookupratio(float f_fr) {
+  uint16_t errors[72]={0,67,71,77,83,91,100,111,125,
+                       133,143,154,167,182,200,214,222,231,
+                       250,267,273,286,300,308,333,357,364,
+                       375,385,400,417,429,444,455,462,467,
+                       500,533,538,545,556,571,583,600,615,
+                       625,636,643,667,692,700,714,727,733,
+                       750,769,778,786,800,818,833,846,857,
+                       867,875,889,900,909,917,923,929,933};
+
+  uint8_t ratios[72]={0x10,0xf1,0xe1,0xd1,0xc1,0xb1,0xa1,0x91,0x81,
+                      0xf2,0x71,0xd2,0x61,0xb2,0x51,0xe3,0x92,0xd3,
+                      0x41,0xf4,0xb3,0x72,0xa3,0xd4,0x31,0xe5,0xb4,
+                      0x83,0xd5,0x52,0xc5,0x73,0x94,0xb5,0xd6,0xf7,
+                      0x21,0xf8,0xd7,0xb6,0x95,0x74,0xc7,0x53,0xd8,
+                      0x85,0xb7,0xe9,0x32,0xd9,0xa7,0x75,0xb8,0xfb,
+                      0x43,0xda,0x97,0xeb,0x54,0xb9,0x65,0xdb,0x76,
+                      0xfd,0x87,0x98,0xa9,0xba,0xcb,0xdc,0xed,0xfe};
+
+  int fr = (f_fr-1)*1000;
+  int i=0, i_result=0;
+  int err=0, lasterr=1000;
+  for(i=0; i<72; i++) {
+    if(fr<errors[i]) {
+      err=errors[i]-fr;
+    } else {
+      err=fr-errors[i];
+    }
+    if(err<lasterr) {
+      i_result=i;
+      lasterr=err;
+    }
+  }
+  return ratios[i_result];
+}
+static uint32_t baud2divisor(unsigned int baudrate) {
+  uint32_t int_ratio;
+  uint32_t error;
+  uint32_t dl=0;
+  float f_ratio;
+  float f_fr;
+  float f_dl;
+  float f_pclk = (float)CONFIG_CPU_FREQUENCY / CONFIG_UART_PCLKDIV;
+  uint8_t fract_ratio;
+  f_ratio=(f_pclk / 16 / baudrate);
+  int_ratio = (int)f_ratio;
+  error=(f_ratio*1000)-(int_ratio*1000);
+  if(error>990) {
+    int_ratio++;
+  } else if(error>10) {
+    f_fr=1.5;
+    f_dl=f_pclk / (16 * baudrate * (f_fr));
+    dl = (int)f_dl;
+    f_fr=f_pclk / (16 * baudrate * dl);
+    fract_ratio = uart_lookupratio(f_fr);
+  }
+  if(!dl) {
+    return int_ratio;
+  } else {
+    return ((fract_ratio<<16)&0xff0000) | dl;
+  }
+}
+
+int main(int argc, char *argv[])
+{
+   if (argc != 2)
+   {
+      printf("usage: %s baud\n", argv[0]);
+      return -1;
+   }
+      
+   printf("Baud %d : 0x%X\n", atoi(argv[1]), baud2divisor(atoi(argv[1])));
+
+   return 0;
+}

src/bootldr/bits.h

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

src/bootldr/ccsbcs.c

@@ -31,484 +31,463 @@
 #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,
-    0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
+	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
-    0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
+	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
-    0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
+	0x00FF, 0x00D6, 0x00DC, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192,
-    0x00FF, 0x00D6, 0x00DC, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192,
+	0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
-    0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
+	0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
-    0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
+	0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
-    0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
+	0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
-    0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
+	0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
-    0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+	0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4,
-    0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4,
+	0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229,
-    0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229,
+	0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248,
-    0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248,
+	0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
-    0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
 };
 
 #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,
-    0x0000, 0x0000, 0x00E9, 0x00E2, 0x0000, 0x00E0, 0x0000, 0x00E7,
+	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x0000, 0x0000, 0x0000,
-    0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x0651, 0x0652, 0x00F4, 0x00A4, 0x0640, 0x00FB, 0x00F9,
-    0x0000, 0x0651, 0x0652, 0x00F4, 0x00A4, 0x0640, 0x00FB, 0x00F9,
+	0x0621, 0x0622, 0x0623, 0x0624, 0x00A3, 0x0625, 0x0626, 0x0627,
-    0x0621, 0x0622, 0x0623, 0x0624, 0x00A3, 0x0625, 0x0626, 0x0627,
+	0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F,
-    0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F,
+	0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x00AB, 0x00BB,
-    0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
+	0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
-    0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
+	0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
-    0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
+	0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
-    0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+	0x0636, 0x0637, 0x0638, 0x0639, 0x063A, 0x0641, 0x00B5, 0x0642,
-    0x0636, 0x0637, 0x0638, 0x0639, 0x063A, 0x0641, 0x00B5, 0x0642,
+	0x0643, 0x0644, 0x0645, 0x0646, 0x0647, 0x0648, 0x0649, 0x064A,
-    0x0643, 0x0644, 0x0645, 0x0646, 0x0647, 0x0648, 0x0649, 0x064A,
+	0x2261, 0x064B, 0x064C, 0x064D, 0x064E, 0x064F, 0xO650, 0x2248,
-    0x2261, 0x064B, 0x064C, 0x064D, 0x064E, 0x064F, 0xO650, 0x2248,
+	0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
-    0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
 };
 
 #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,
-    0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398,
+	0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, 0x03A0,
-    0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, 0x03A0,
+	0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9,
-    0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9,
+	0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, 0x03B8,
-    0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, 0x03B8,
+	0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, 0x03C0,
-    0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, 0x03C0,
+	0x03C1, 0x03C3, 0x03C2, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8,
-    0x03C1, 0x03C3, 0x03C2, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
+	0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
-    0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
+	0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
-    0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
+	0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
-    0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+	0x03C9, 0x03AC, 0x03AD, 0x03AE, 0x03CA, 0x03AF, 0x03CC, 0x03CD,
-    0x03C9, 0x03AC, 0x03AD, 0x03AE, 0x03CA, 0x03AF, 0x03CC, 0x03CD,
+	0x03CB, 0x03CE, 0x0386, 0x0388, 0x0389, 0x038A, 0x038C, 0x038E,
-    0x03CB, 0x03CE, 0x0386, 0x0388, 0x0389, 0x038A, 0x038C, 0x038E,
+	0x038F, 0x00B1, 0x2265, 0x2264, 0x03AA, 0x03AB, 0x00F7, 0x2248,
-    0x038F, 0x00B1, 0x2265, 0x2264, 0x03AA, 0x03AB, 0x00F7, 0x2248,
+	0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
-    0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
 };
 
 #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,
-    0x0106, 0x00FC, 0x00E9, 0x0101, 0x00E4, 0x0123, 0x00E5, 0x0107,
+	0x0142, 0x0113, 0x0156, 0x0157, 0x012B, 0x0179, 0x00C4, 0x00C5,
-    0x0142, 0x0113, 0x0156, 0x0157, 0x012B, 0x0179, 0x00C4, 0x00C5,
+	0x00C9, 0x00E6, 0x00C6, 0x014D, 0x00F6, 0x0122, 0x00A2, 0x015A,
-    0x00C9, 0x00E6, 0x00C6, 0x014D, 0x00F6, 0x0122, 0x00A2, 0x015A,
+	0x015B, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x00A4,
-    0x015B, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x00A4,
+	0x0100, 0x012A, 0x00F3, 0x017B, 0x017C, 0x017A, 0x201D, 0x00A6,
-    0x0100, 0x012A, 0x00F3, 0x017B, 0x017C, 0x017A, 0x201D, 0x00A6,
+	0x00A9, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x0141, 0x00AB, 0x00BB,
-    0x00A9, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x0141, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x0104, 0x010C, 0x0118,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x0104, 0x010C, 0x0118,
+	0x0116, 0x2563, 0x2551, 0x2557, 0x255D, 0x012E, 0x0160, 0x2510,
-    0x0116, 0x2563, 0x2551, 0x2557, 0x255D, 0x012E, 0x0160, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x0172, 0x016A,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x0172, 0x016A,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x017D,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x017D,
+	0x0105, 0x010D, 0x0119, 0x0117, 0x012F, 0x0161, 0x0173, 0x016B,
-    0x0105, 0x010D, 0x0119, 0x0117, 0x012F, 0x0161, 0x0173, 0x016B,
+	0x017E, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
-    0x017E, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+	0x00D3, 0x00DF, 0x014C, 0x0143, 0x00F5, 0x00D5, 0x00B5, 0x0144,
-    0x00D3, 0x00DF, 0x014C, 0x0143, 0x00F5, 0x00D5, 0x00B5, 0x0144,
+	0x0136, 0x0137, 0x013B, 0x013C, 0x0146, 0x0112, 0x0145, 0x2019,
-    0x0136, 0x0137, 0x013B, 0x013C, 0x0146, 0x0112, 0x0145, 0x2019,
+	0x00AD, 0x00B1, 0x201C, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x201E,
-    0x00AD, 0x00B1, 0x201C, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x201E,
+	0x00B0, 0x2219, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0
-    0x00B0, 0x2219, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0
 };
 
 #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,
-    0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
+	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
-    0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
+	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
-    0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
+	0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x0192,
-    0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x0192,
+	0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
-    0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
+	0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
-    0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0,
+	0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510,
-    0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
+	0x00F0, 0x00D0, 0x00CA, 0x00CB, 0x00C8, 0x0131, 0x00CD, 0x00CE,
-    0x00F0, 0x00D0, 0x00CA, 0x00CB, 0x00C8, 0x0131, 0x00CD, 0x00CE,
+	0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00A6, 0x00CC, 0x2580,
-    0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00A6, 0x00CC, 0x2580,
+	0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x00FE,
-    0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x00FE,
+	0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4,
-    0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4,
+	0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8,
-    0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8,
+	0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0
-    0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0
 };
 
 #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,
-    0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x016F, 0x0107, 0x00E7,
+	0x0142, 0x00EB, 0x0150, 0x0151, 0x00EE, 0x0179, 0x00C4, 0x0106,
-    0x0142, 0x00EB, 0x0150, 0x0151, 0x00EE, 0x0179, 0x00C4, 0x0106,
+	0x00C9, 0x0139, 0x013A, 0x00F4, 0x00F6, 0x013D, 0x013E, 0x015A,
-    0x00C9, 0x0139, 0x013A, 0x00F4, 0x00F6, 0x013D, 0x013E, 0x015A,
+	0x015B, 0x00D6, 0x00DC, 0x0164, 0x0165, 0x0141, 0x00D7, 0x010D,
-    0x015B, 0x00D6, 0x00DC, 0x0164, 0x0165, 0x0141, 0x00D7, 0x010D,
+	0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x0104, 0x0105, 0x017D, 0x017E,
-    0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x0104, 0x0105, 0x017D, 0x017E,
+	0x0118, 0x0119, 0x00AC, 0x017A, 0x010C, 0x015F, 0x00AB, 0x00BB,
-    0x0118, 0x0119, 0x00AC, 0x017A, 0x010C, 0x015F, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x011A,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x011A,
+	0x015E, 0x2563, 0x2551, 0x2557, 0x255D, 0x017B, 0x017C, 0x2510,
-    0x015E, 0x2563, 0x2551, 0x2557, 0x255D, 0x017B, 0x017C, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x0102, 0x0103,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x0102, 0x0103,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
+	0x0111, 0x0110, 0x010E, 0x00CB, 0x010F, 0x0147, 0x00CD, 0x00CE,
-    0x0111, 0x0110, 0x010E, 0x00CB, 0x010F, 0x0147, 0x00CD, 0x00CE,
+	0x011B, 0x2518, 0x250C, 0x2588, 0x2584, 0x0162, 0x016E, 0x2580,
-    0x011B, 0x2518, 0x250C, 0x2588, 0x2584, 0x0162, 0x016E, 0x2580,
+	0x00D3, 0x00DF, 0x00D4, 0x0143, 0x0144, 0x0148, 0x0160, 0x0161,
-    0x00D3, 0x00DF, 0x00D4, 0x0143, 0x0144, 0x0148, 0x0160, 0x0161,
+	0x0154, 0x00DA, 0x0155, 0x0170, 0x00FD, 0x00DD, 0x0163, 0x00B4,
-    0x0154, 0x00DA, 0x0155, 0x0170, 0x00FD, 0x00DD, 0x0163, 0x00B4,
+	0x00AD, 0x02DD, 0x02DB, 0x02C7, 0x02D8, 0x00A7, 0x00F7, 0x00B8,
-    0x00AD, 0x02DD, 0x02DB, 0x02C7, 0x02D8, 0x00A7, 0x00F7, 0x00B8,
+	0x00B0, 0x00A8, 0x02D9, 0x0171, 0x0158, 0x0159, 0x25A0, 0x00A0
-    0x00B0, 0x00A8, 0x02D9, 0x0171, 0x0158, 0x0159, 0x25A0, 0x00A0
 };
 
 #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,
-    0x0452, 0x0402, 0x0453, 0x0403, 0x0451, 0x0401, 0x0454, 0x0404,
+	0x0455, 0x0405, 0x0456, 0x0406, 0x0457, 0x0407, 0x0458, 0x0408,
-    0x0455, 0x0405, 0x0456, 0x0406, 0x0457, 0x0407, 0x0458, 0x0408,
+	0x0459, 0x0409, 0x045A, 0x040A, 0x045B, 0x040B, 0x045C, 0x040C,
-    0x0459, 0x0409, 0x045A, 0x040A, 0x045B, 0x040B, 0x045C, 0x040C,
+	0x045E, 0x040E, 0x045F, 0x040F, 0x044E, 0x042E, 0x044A, 0x042A,
-    0x045E, 0x040E, 0x045F, 0x040F, 0x044E, 0x042E, 0x044A, 0x042A,
+	0x0430, 0x0410, 0x0431, 0x0411, 0x0446, 0x0426, 0x0434, 0x0414,
-    0x0430, 0x0410, 0x0431, 0x0411, 0x0446, 0x0426, 0x0434, 0x0414,
+	0x0435, 0x0415, 0x0444, 0x0424, 0x0433, 0x0413, 0x00AB, 0x00BB,
-    0x0435, 0x0415, 0x0444, 0x0424, 0x0433, 0x0413, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x0445, 0x0425, 0x0438,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x0445, 0x0425, 0x0438,
+	0x0418, 0x2563, 0x2551, 0x2557, 0x255D, 0x0439, 0x0419, 0x2510,
-    0x0418, 0x2563, 0x2551, 0x2557, 0x255D, 0x0439, 0x0419, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x043A, 0x041A,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x043A, 0x041A,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
+	0x043B, 0x041B, 0x043C, 0x041C, 0x043D, 0x041D, 0x043E, 0x041E,
-    0x043B, 0x041B, 0x043C, 0x041C, 0x043D, 0x041D, 0x043E, 0x041E,
+	0x043F, 0x2518, 0x250C, 0x2588, 0x2584, 0x041F, 0x044F, 0x2580,
-    0x043F, 0x2518, 0x250C, 0x2588, 0x2584, 0x041F, 0x044F, 0x2580,
+	0x042F, 0x0440, 0x0420, 0x0441, 0x0421, 0x0442, 0x0422, 0x0443,
-    0x042F, 0x0440, 0x0420, 0x0441, 0x0421, 0x0442, 0x0422, 0x0443,
+	0x0423, 0x0436, 0x0416, 0x0432, 0x0412, 0x044C, 0x042C, 0x2116,
-    0x0423, 0x0436, 0x0416, 0x0432, 0x0412, 0x044C, 0x042C, 0x2116,
+	0x00AD, 0x044B, 0x042B, 0x0437, 0x0417, 0x0448, 0x0428, 0x044D,
-    0x00AD, 0x044B, 0x042B, 0x0437, 0x0417, 0x0448, 0x0428, 0x044D,
+	0x042D, 0x0449, 0x0429, 0x0447, 0x0427, 0x00A7, 0x25A0, 0x00A0
-    0x042D, 0x0449, 0x0429, 0x0447, 0x0427, 0x00A7, 0x25A0, 0x00A0
 };
 
 #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,
-    0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
+	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x0131, 0x00C4, 0x00C5,
-    0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x0131, 0x00C4, 0x00C5,
+	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
-    0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
+	0x0130, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x015E, 0x015F,
-    0x0130, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x015E, 0x015F,
+	0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x011E, 0x011F,
-    0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x011E, 0x011F,
+	0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
-    0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0,
+	0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510,
-    0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
+	0x00BA, 0x00AA, 0x00CA, 0x00CB, 0x00C8, 0x0000, 0x00CD, 0x00CE,
-    0x00BA, 0x00AA, 0x00CA, 0x00CB, 0x00C8, 0x0000, 0x00CD, 0x00CE,
+	0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00A6, 0x00CC, 0x2580,
-    0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00A6, 0x00CC, 0x2580,
+	0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x0000,
-    0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x0000,
+	0x00D7, 0x00DA, 0x00DB, 0x00D9, 0x00EC, 0x00FF, 0x00AF, 0x00B4,
-    0x00D7, 0x00DA, 0x00DB, 0x00D9, 0x00EC, 0x00FF, 0x00AF, 0x00B4,
+	0x00AD, 0x00B1, 0x0000, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8,
-    0x00AD, 0x00B1, 0x0000, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8,
+	0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0
-    0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0
 };
 
 #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,
-    0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
+	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
-    0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
+	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
-    0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
+	0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x0192,
-    0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x0192,
+	0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
-    0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
+	0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
-    0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0,
+	0x00A9, 0x2563, 0x2551, 0x2557, 0x2550, 0x00A2, 0x00A5, 0x2510,
-    0x00A9, 0x2563, 0x2551, 0x2557, 0x2550, 0x00A2, 0x00A5, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
+	0x00F0, 0x00D0, 0x00CA, 0x00CB, 0x00C8, 0x20AC, 0x00CD, 0x00CE,
-    0x00F0, 0x00D0, 0x00CA, 0x00CB, 0x00C8, 0x20AC, 0x00CD, 0x00CE,
+	0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00C6, 0x00CC, 0x2580,
-    0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00C6, 0x00CC, 0x2580,
+	0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x00FE,
-    0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x00FE,
+	0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4,
-    0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4,
+	0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8,
-    0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8,
+	0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0
-    0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0
 };
 
 #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,
-    0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7,
+	0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
-    0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
+	0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7,
-    0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7,
+	0x05E8, 0x05E9, 0x05EA, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192,
-    0x05E8, 0x05E9, 0x05EA, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192,
+	0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
-    0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
+	0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
-    0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
+	0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
-    0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
+	0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
-    0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
+	0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
-    0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+	0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4,
-    0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4,
+	0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229,
-    0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229,
+	0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248,
-    0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248,
+	0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
-    0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
 };
 
 #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,
-    0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
+	0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
-    0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
+	0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
-    0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
+	0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
-    0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
+	0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
-    0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
+	0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
-    0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
+	0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
-    0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
+	0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
-    0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
+	0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
-    0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+	0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
-    0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
+	0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F,
-    0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F,
+	0x0401, 0x0451, 0x0404, 0x0454, 0x0407, 0x0457, 0x040E, 0x045E,
-    0x0401, 0x0451, 0x0404, 0x0454, 0x0407, 0x0457, 0x040E, 0x045E,
+	0x00B0, 0x2219, 0x00B7, 0x221A, 0x2116, 0x00A4, 0x25A0, 0x00A0
-    0x00B0, 0x2219, 0x00B7, 0x221A, 0x2116, 0x00A4, 0x25A0, 0x00A0
 };
 
 #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,
-    0x20AC, 0x0000, 0x0000, 0x0000, 0x0000, 0x2026, 0x0000, 0x0000,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x00A0, 0x0E01, 0x0E02, 0x0E03, 0x0E04, 0x0E05, 0x0E06, 0x0E07,
-    0x00A0, 0x0E01, 0x0E02, 0x0E03, 0x0E04, 0x0E05, 0x0E06, 0x0E07,
+	0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F,
-    0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F,
+	0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17,
-    0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17,
+	0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E, 0x0E1F,
-    0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E, 0x0E1F,
+	0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27,
-    0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27,
+	0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F,
-    0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F,
+	0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
-    0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
+	0x0E38, 0x0E39, 0x0E3A, 0x0000, 0x0000, 0x0000, 0x0000, 0x0E3F,
-    0x0E38, 0x0E39, 0x0E3A, 0x0000, 0x0000, 0x0000, 0x0000, 0x0E3F,
+	0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47,
-    0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47,
+	0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F,
-    0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F,
+	0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57,
-    0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57,
+	0x0E58, 0x0E59, 0x0E5A, 0x0E5B, 0x0000, 0x0000, 0x0000, 0x0000
-    0x0E58, 0x0E59, 0x0E5A, 0x0E5B, 0x0000, 0x0000, 0x0000, 0x0000
 };
 
 #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,
-    0x20AC, 0x0000, 0x201A, 0x0000, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x0000, 0x2030, 0x0160, 0x2039, 0x015A, 0x0164, 0x017D, 0x0179,
-    0x0000, 0x2030, 0x0160, 0x2039, 0x015A, 0x0164, 0x017D, 0x0179,
+	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x0000, 0x2122, 0x0161, 0x203A, 0x015B, 0x0165, 0x017E, 0x017A,
-    0x0000, 0x2122, 0x0161, 0x203A, 0x015B, 0x0165, 0x017E, 0x017A,
+	0x00A0, 0x02C7, 0x02D8, 0x0141, 0x00A4, 0x0104, 0x00A6, 0x00A7,
-    0x00A0, 0x02C7, 0x02D8, 0x0141, 0x00A4, 0x0104, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x015E, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x017B,
-    0x00A8, 0x00A9, 0x015E, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x017B,
+	0x00B0, 0x00B1, 0x02DB, 0x0142, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B0, 0x00B1, 0x02DB, 0x0142, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x0105, 0x015F, 0x00BB, 0x013D, 0x02DD, 0x013E, 0x017C,
-    0x00B8, 0x0105, 0x015F, 0x00BB, 0x013D, 0x02DD, 0x013E, 0x017C,
+	0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7,
-    0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7,
+	0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E,
-    0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E,
+	0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7,
-    0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7,
+	0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF,
-    0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF,
+	0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7,
-    0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7,
+	0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F,
-    0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F,
+	0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7,
-    0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7,
+	0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9
-    0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9
 };
 
 #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,
-    0x0402, 0x0403, 0x201A, 0x0453, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x20AC, 0x2030, 0x0409, 0x2039, 0x040A, 0x040C, 0x040B, 0x040F,
-    0x20AC, 0x2030, 0x0409, 0x2039, 0x040A, 0x040C, 0x040B, 0x040F,
+	0x0452, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0452, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x0000, 0x2111, 0x0459, 0x203A, 0x045A, 0x045C, 0x045B, 0x045F,
-    0x0000, 0x2111, 0x0459, 0x203A, 0x045A, 0x045C, 0x045B, 0x045F,
+	0x00A0, 0x040E, 0x045E, 0x0408, 0x00A4, 0x0490, 0x00A6, 0x00A7,
-    0x00A0, 0x040E, 0x045E, 0x0408, 0x00A4, 0x0490, 0x00A6, 0x00A7,
+	0x0401, 0x00A9, 0x0404, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x0407,
-    0x0401, 0x00A9, 0x0404, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x0407,
+	0x00B0, 0x00B1, 0x0406, 0x0456, 0x0491, 0x00B5, 0x00B6, 0x00B7,
-    0x00B0, 0x00B1, 0x0406, 0x0456, 0x0491, 0x00B5, 0x00B6, 0x00B7,
+	0x0451, 0x2116, 0x0454, 0x00BB, 0x0458, 0x0405, 0x0455, 0x0457,
-    0x0451, 0x2116, 0x0454, 0x00BB, 0x0458, 0x0405, 0x0455, 0x0457,
+	0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
-    0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
+	0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
-    0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
+	0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
-    0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
+	0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
-    0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
+	0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
-    0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
+	0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
-    0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
+	0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
-    0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
+	0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F
-    0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F
 };
 
 #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,
-    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x017D, 0x0000,
-    0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x017D, 0x0000,
+	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x0000, 0x017E, 0x0178,
-    0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x0000, 0x017E, 0x0178,
+	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-    0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
-    0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
-    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
-    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+	0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
-    0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
+	0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
-    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
-    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
-    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+	0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
-    0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+	0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF
-    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF
 };
 
 #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,
-    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x0000, 0x2030, 0x0000, 0x2039, 0x000C, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x2030, 0x0000, 0x2039, 0x000C, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x0000, 0x2122, 0x0000, 0x203A, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x2122, 0x0000, 0x203A, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x00A0, 0x0385, 0x0386, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-    0x00A0, 0x0385, 0x0386, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x0000, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x2015,
-    0x00A8, 0x00A9, 0x0000, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x2015,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x00B5, 0x00B6, 0x00B7,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x00B5, 0x00B6, 0x00B7,
+	0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F,
-    0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F,
+	0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
-    0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
+	0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
-    0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
+	0x03A0, 0x03A1, 0x0000, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7,
-    0x03A0, 0x03A1, 0x0000, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7,
+	0x03A8, 0x03A9, 0x03AA, 0x03AD, 0x03AC, 0x03AD, 0x03AE, 0x03AF,
-    0x03A8, 0x03A9, 0x03AA, 0x03AD, 0x03AC, 0x03AD, 0x03AE, 0x03AF,
+	0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7,
-    0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7,
+	0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
-    0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
+	0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7,
-    0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7,
+	0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, 0x0000
-    0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, 0x0000
 };
 
 #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,
-    0x20AC, 0x0000, 0x210A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x0000, 0x0000,
-    0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x0000, 0x0000, 0x0178,
-    0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x0000, 0x0000, 0x0178,
+	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-    0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
-    0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
-    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
-    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+	0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
-    0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
+	0x00D8, 0x00D9, 0x00DA, 0x00BD, 0x00DC, 0x0130, 0x015E, 0x00DF,
-    0x00D8, 0x00D9, 0x00DA, 0x00BD, 0x00DC, 0x0130, 0x015E, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
-    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
-    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+	0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
-    0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+	0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF
-    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF
 };
 
 #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,
-    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x02C6, 0x2030, 0x0000, 0x2039, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x02C6, 0x2030, 0x0000, 0x2039, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x02DC, 0x2122, 0x0000, 0x203A, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x02DC, 0x2122, 0x0000, 0x203A, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-    0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
-    0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+	0x05B0, 0x05B1, 0x05B2, 0x05B3, 0x05B4, 0x05B5, 0x05B6, 0x05B7,
-    0x05B0, 0x05B1, 0x05B2, 0x05B3, 0x05B4, 0x05B5, 0x05B6, 0x05B7,
+	0x05B8, 0x05B9, 0x0000, 0x05BB, 0x05BC, 0x05BD, 0x05BE, 0x05BF,
-    0x05B8, 0x05B9, 0x0000, 0x05BB, 0x05BC, 0x05BD, 0x05BE, 0x05BF,
+	0x05C0, 0x05C1, 0x05C2, 0x05C3, 0x05F0, 0x05F1, 0x05F2, 0x05F3,
-    0x05C0, 0x05C1, 0x05C2, 0x05C3, 0x05F0, 0x05F1, 0x05F2, 0x05F3,
+	0x05F4, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x05F4, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7,
-    0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7,
+	0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
-    0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
+	0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7,
-    0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7,
+	0x05E8, 0x05E9, 0x05EA, 0x0000, 0x0000, 0x200E, 0x200F, 0x0000
-    0x05E8, 0x05E9, 0x05EA, 0x0000, 0x0000, 0x200E, 0x200F, 0x0000
 };
 
 #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,
-    0x20AC, 0x067E, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x02C6, 0x2030, 0x0679, 0x2039, 0x0152, 0x0686, 0x0698, 0x0688,
-    0x02C6, 0x2030, 0x0679, 0x2039, 0x0152, 0x0686, 0x0698, 0x0688,
+	0x06AF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x06AF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x06A9, 0x2122, 0x0691, 0x203A, 0x0153, 0x200C, 0x200D, 0x06BA,
-    0x06A9, 0x2122, 0x0691, 0x203A, 0x0153, 0x200C, 0x200D, 0x06BA,
+	0x00A0, 0x060C, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-    0x00A0, 0x060C, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x06BE, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-    0x00A8, 0x00A9, 0x06BE, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x00B9, 0x061B, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x061F,
-    0x00B8, 0x00B9, 0x061B, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x061F,
+	0x06C1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627,
-    0x06C1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627,
+	0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F,
-    0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F,
+	0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x00D7,
-    0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x00D7,
+	0x0637, 0x0638, 0x0639, 0x063A, 0x0640, 0x0640, 0x0642, 0x0643,
-    0x0637, 0x0638, 0x0639, 0x063A, 0x0640, 0x0640, 0x0642, 0x0643,
+	0x00E0, 0x0644, 0x00E2, 0x0645, 0x0646, 0x0647, 0x0648, 0x00E7,
-    0x00E0, 0x0644, 0x00E2, 0x0645, 0x0646, 0x0647, 0x0648, 0x00E7,
+	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0649, 0x064A, 0x00EE, 0x00EF,
-    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0649, 0x064A, 0x00EE, 0x00EF,
+	0x064B, 0x064C, 0x064D, 0x064E, 0x00F4, 0x064F, 0x0650, 0x00F7,
-    0x064B, 0x064C, 0x064D, 0x064E, 0x00F4, 0x064F, 0x0650, 0x00F7,
+	0x0651, 0x00F9, 0x0652, 0x00FB, 0x00FC, 0x200E, 0x200F, 0x06D2
-    0x0651, 0x00F9, 0x0652, 0x00FB, 0x00FC, 0x200E, 0x200F, 0x06D2
 }
 
 #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,
-    0x20AC, 0x0000, 0x201A, 0x0000, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x0000, 0x2030, 0x0000, 0x2039, 0x0000, 0x00A8, 0x02C7, 0x00B8,
-    0x0000, 0x2030, 0x0000, 0x2039, 0x0000, 0x00A8, 0x02C7, 0x00B8,
+	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x0000, 0x2122, 0x0000, 0x203A, 0x0000, 0x00AF, 0x02DB, 0x0000,
-    0x0000, 0x2122, 0x0000, 0x203A, 0x0000, 0x00AF, 0x02DB, 0x0000,
+	0x00A0, 0x0000, 0x00A2, 0x00A3, 0x00A4, 0x0000, 0x00A6, 0x00A7,
-    0x00A0, 0x0000, 0x00A2, 0x00A3, 0x00A4, 0x0000, 0x00A6, 0x00A7,
+	0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-    0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6,
-    0x00B8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6,
+	0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112,
-    0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112,
+	0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B,
-    0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B,
+	0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7,
-    0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7,
+	0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF,
-    0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF,
+	0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113,
-    0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113,
+	0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C,
-    0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C,
+	0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7,
-    0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7,
+	0x0173, 0x014E, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x02D9
-    0x0173, 0x014E, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x02D9
 };
 
 #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,
-    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x02C6, 0x2030, 0x0000, 0x2039, 0x0152, 0x0000, 0x0000, 0x0000,
-    0x02C6, 0x2030, 0x0000, 0x2039, 0x0152, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x02DC, 0x2122, 0x0000, 0x203A, 0x0153, 0x0000, 0x0000, 0x0178,
-    0x02DC, 0x2122, 0x0000, 0x203A, 0x0153, 0x0000, 0x0000, 0x0178,
+	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-    0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
-    0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+	0x00C0, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
-    0x00C0, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x0300, 0x00CD, 0x00CE, 0x00CF,
-    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x0300, 0x00CD, 0x00CE, 0x00CF,
+	0x0110, 0x00D1, 0x0309, 0x00D3, 0x00D4, 0x01A0, 0x00D6, 0x00D7,
-    0x0110, 0x00D1, 0x0309, 0x00D3, 0x00D4, 0x01A0, 0x00D6, 0x00D7,
+	0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x01AF, 0x0303, 0x00DF,
-    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x01AF, 0x0303, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
-    0x00E0, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0301, 0x00ED, 0x00EE, 0x00EF,
-    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0301, 0x00ED, 0x00EE, 0x00EF,
+	0x0111, 0x00F1, 0x0323, 0x00F3, 0x00F4, 0x01A1, 0x00F6, 0x00F7,
-    0x0111, 0x00F1, 0x0323, 0x00F3, 0x00F4, 0x01A1, 0x00F6, 0x00F7,
+	0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x01B0, 0x20AB, 0x00FF
-    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x01B0, 0x20AB, 0x00FF
 };
 
 #endif
@@ -519,54 +498,43 @@ const WCHAR Tbl[] =     /*  CP1258(0x80-0xFF) to Unicode conversion table */
 #endif
 
 
-WCHAR ff_convert (  /* Converted character, Returns zero on error */
+WCHAR ff_convert (	/* Converted character, Returns zero on error */
-    WCHAR   src,    /* Character code to be converted */
+	WCHAR	src,	/* Character code to be converted */
-    UINT    dir     /* 0: Unicode to OEMCP, 1: OEMCP to Unicode */
+	UINT	dir		/* 0: Unicode to OEMCP, 1: OEMCP to Unicode */
 )
 {
-    WCHAR c;
+	WCHAR c;
 
 
-    if ( src < 0x80 )   /* ASCII */
+	if (src < 0x80) {	/* ASCII */
-    {
+		c = src;
-        c = src;
 
-    }
+	} else {
-    else
+		if (dir) {		/* OEMCP to Unicode */
-    {
+			c = (src >= 0x100) ? 0 : Tbl[src - 0x80];
-        if ( dir )      /* OEMCP to Unicode */
-        {
-            c = ( src >= 0x100 ) ? 0 : Tbl[src - 0x80];
 
-        }
+		} else {		/* Unicode to OEMCP */
-        else            /* Unicode to OEMCP */
+			for (c = 0; c < 0x80; c++) {
-        {
+				if (src == Tbl[c]) break;
-            for ( c = 0; c < 0x80; c++ )
+			}
-            {
+			c = (c + 0x80) & 0xFF;
-                if ( src == Tbl[c] )
+		}
-                {
+	}
-                    break;
-                }
-            }
 
-            c = ( c + 0x80 ) & 0xFF;
+	return c;
-        }
-    }
-
-    return c;
 }
 
 
-WCHAR ff_wtoupper ( /* Upper converted character */
+WCHAR ff_wtoupper (	/* Upper converted character */
-    WCHAR chr       /* Input character */
+	WCHAR chr		/* Input character */
 )
 {
-    static const WCHAR tbl_lower[] = { 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0xA1, 0x00A2, 0x00A3, 0x00A5, 0x00AC, 0x00AF, 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0x0FF, 0x101, 0x103, 0x105, 0x107, 0x109, 0x10B, 0x10D, 0x10F, 0x111, 0x113, 0x115, 0x117, 0x119, 0x11B, 0x11D, 0x11F, 0x121, 0x123, 0x125, 0x127, 0x129, 0x12B, 0x12D, 0x12F, 0x131, 0x133, 0x135, 0x137, 0x13A, 0x13C, 0x13E, 0x140, 0x142, 0x144, 0x146, 0x148, 0x14B, 0x14D, 0x14F, 0x151, 0x153, 0x155, 0x157, 0x159, 0x15B, 0x15D, 0x15F, 0x161, 0x163, 0x165, 0x167, 0x169, 0x16B, 0x16D, 0x16F, 0x171, 0x173, 0x175, 0x177, 0x17A, 0x17C, 0x17E, 0x192, 0x3B1, 0x3B2, 0x3B3, 0x3B4, 0x3B5, 0x3B6, 0x3B7, 0x3B8, 0x3B9, 0x3BA, 0x3BB, 0x3BC, 0x3BD, 0x3BE, 0x3BF, 0x3C0, 0x3C1, 0x3C3, 0x3C4, 0x3C5, 0x3C6, 0x3C7, 0x3C8, 0x3C9, 0x3CA, 0x430, 0x431, 0x432, 0x433, 0x434, 0x435, 0x436, 0x437, 0x438, 0x439, 0x43A, 0x43B, 0x43C, 0x43D, 0x43E, 0x43F, 0x440, 0x441, 0x442, 0x443, 0x444, 0x445, 0x446, 0x447, 0x448, 0x449, 0x44A, 0x44B, 0x44C, 0x44D, 0x44E, 0x44F, 0x451, 0x452, 0x453, 0x454, 0x455, 0x456, 0x457, 0x458, 0x459, 0x45A, 0x45B, 0x45C, 0x45E, 0x45F, 0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x217A, 0x217B, 0x217C, 0x217D, 0x217E, 0x217F, 0xFF41, 0xFF42, 0xFF43, 0xFF44, 0xFF45, 0xFF46, 0xFF47, 0xFF48, 0xFF49, 0xFF4A, 0xFF4B, 0xFF4C, 0xFF4D, 0xFF4E, 0xFF4F, 0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57, 0xFF58, 0xFF59, 0xFF5A, 0 };
+	static const WCHAR tbl_lower[] = { 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0xA1, 0x00A2, 0x00A3, 0x00A5, 0x00AC, 0x00AF, 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0x0FF, 0x101, 0x103, 0x105, 0x107, 0x109, 0x10B, 0x10D, 0x10F, 0x111, 0x113, 0x115, 0x117, 0x119, 0x11B, 0x11D, 0x11F, 0x121, 0x123, 0x125, 0x127, 0x129, 0x12B, 0x12D, 0x12F, 0x131, 0x133, 0x135, 0x137, 0x13A, 0x13C, 0x13E, 0x140, 0x142, 0x144, 0x146, 0x148, 0x14B, 0x14D, 0x14F, 0x151, 0x153, 0x155, 0x157, 0x159, 0x15B, 0x15D, 0x15F, 0x161, 0x163, 0x165, 0x167, 0x169, 0x16B, 0x16D, 0x16F, 0x171, 0x173, 0x175, 0x177, 0x17A, 0x17C, 0x17E, 0x192, 0x3B1, 0x3B2, 0x3B3, 0x3B4, 0x3B5, 0x3B6, 0x3B7, 0x3B8, 0x3B9, 0x3BA, 0x3BB, 0x3BC, 0x3BD, 0x3BE, 0x3BF, 0x3C0, 0x3C1, 0x3C3, 0x3C4, 0x3C5, 0x3C6, 0x3C7, 0x3C8, 0x3C9, 0x3CA, 0x430, 0x431, 0x432, 0x433, 0x434, 0x435, 0x436, 0x437, 0x438, 0x439, 0x43A, 0x43B, 0x43C, 0x43D, 0x43E, 0x43F, 0x440, 0x441, 0x442, 0x443, 0x444, 0x445, 0x446, 0x447, 0x448, 0x449, 0x44A, 0x44B, 0x44C, 0x44D, 0x44E, 0x44F, 0x451, 0x452, 0x453, 0x454, 0x455, 0x456, 0x457, 0x458, 0x459, 0x45A, 0x45B, 0x45C, 0x45E, 0x45F, 0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x217A, 0x217B, 0x217C, 0x217D, 0x217E, 0x217F, 0xFF41, 0xFF42, 0xFF43, 0xFF44, 0xFF45, 0xFF46, 0xFF47, 0xFF48, 0xFF49, 0xFF4A, 0xFF4B, 0xFF4C, 0xFF4D, 0xFF4E, 0xFF4F, 0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57, 0xFF58, 0xFF59, 0xFF5A, 0 };
-    static const WCHAR tbl_upper[] = { 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x21, 0xFFE0, 0xFFE1, 0xFFE5, 0xFFE2, 0xFFE3, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0x178, 0x100, 0x102, 0x104, 0x106, 0x108, 0x10A, 0x10C, 0x10E, 0x110, 0x112, 0x114, 0x116, 0x118, 0x11A, 0x11C, 0x11E, 0x120, 0x122, 0x124, 0x126, 0x128, 0x12A, 0x12C, 0x12E, 0x130, 0x132, 0x134, 0x136, 0x139, 0x13B, 0x13D, 0x13F, 0x141, 0x143, 0x145, 0x147, 0x14A, 0x14C, 0x14E, 0x150, 0x152, 0x154, 0x156, 0x158, 0x15A, 0x15C, 0x15E, 0x160, 0x162, 0x164, 0x166, 0x168, 0x16A, 0x16C, 0x16E, 0x170, 0x172, 0x174, 0x176, 0x179, 0x17B, 0x17D, 0x191, 0x391, 0x392, 0x393, 0x394, 0x395, 0x396, 0x397, 0x398, 0x399, 0x39A, 0x39B, 0x39C, 0x39D, 0x39E, 0x39F, 0x3A0, 0x3A1, 0x3A3, 0x3A4, 0x3A5, 0x3A6, 0x3A7, 0x3A8, 0x3A9, 0x3AA, 0x410, 0x411, 0x412, 0x413, 0x414, 0x415, 0x416, 0x417, 0x418, 0x419, 0x41A, 0x41B, 0x41C, 0x41D, 0x41E, 0x41F, 0x420, 0x421, 0x422, 0x423, 0x424, 0x425, 0x426, 0x427, 0x428, 0x429, 0x42A, 0x42B, 0x42C, 0x42D, 0x42E, 0x42F, 0x401, 0x402, 0x403, 0x404, 0x405, 0x406, 0x407, 0x408, 0x409, 0x40A, 0x40B, 0x40C, 0x40E, 0x40F, 0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168, 0x2169, 0x216A, 0x216B, 0x216C, 0x216D, 0x216E, 0x216F, 0xFF21, 0xFF22, 0xFF23, 0xFF24, 0xFF25, 0xFF26, 0xFF27, 0xFF28, 0xFF29, 0xFF2A, 0xFF2B, 0xFF2C, 0xFF2D, 0xFF2E, 0xFF2F, 0xFF30, 0xFF31, 0xFF32, 0xFF33, 0xFF34, 0xFF35, 0xFF36, 0xFF37, 0xFF38, 0xFF39, 0xFF3A, 0 };
+	static const WCHAR tbl_upper[] = { 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x21, 0xFFE0, 0xFFE1, 0xFFE5, 0xFFE2, 0xFFE3, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0x178, 0x100, 0x102, 0x104, 0x106, 0x108, 0x10A, 0x10C, 0x10E, 0x110, 0x112, 0x114, 0x116, 0x118, 0x11A, 0x11C, 0x11E, 0x120, 0x122, 0x124, 0x126, 0x128, 0x12A, 0x12C, 0x12E, 0x130, 0x132, 0x134, 0x136, 0x139, 0x13B, 0x13D, 0x13F, 0x141, 0x143, 0x145, 0x147, 0x14A, 0x14C, 0x14E, 0x150, 0x152, 0x154, 0x156, 0x158, 0x15A, 0x15C, 0x15E, 0x160, 0x162, 0x164, 0x166, 0x168, 0x16A, 0x16C, 0x16E, 0x170, 0x172, 0x174, 0x176, 0x179, 0x17B, 0x17D, 0x191, 0x391, 0x392, 0x393, 0x394, 0x395, 0x396, 0x397, 0x398, 0x399, 0x39A, 0x39B, 0x39C, 0x39D, 0x39E, 0x39F, 0x3A0, 0x3A1, 0x3A3, 0x3A4, 0x3A5, 0x3A6, 0x3A7, 0x3A8, 0x3A9, 0x3AA, 0x410, 0x411, 0x412, 0x413, 0x414, 0x415, 0x416, 0x417, 0x418, 0x419, 0x41A, 0x41B, 0x41C, 0x41D, 0x41E, 0x41F, 0x420, 0x421, 0x422, 0x423, 0x424, 0x425, 0x426, 0x427, 0x428, 0x429, 0x42A, 0x42B, 0x42C, 0x42D, 0x42E, 0x42F, 0x401, 0x402, 0x403, 0x404, 0x405, 0x406, 0x407, 0x408, 0x409, 0x40A, 0x40B, 0x40C, 0x40E, 0x40F, 0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168, 0x2169, 0x216A, 0x216B, 0x216C, 0x216D, 0x216E, 0x216F, 0xFF21, 0xFF22, 0xFF23, 0xFF24, 0xFF25, 0xFF26, 0xFF27, 0xFF28, 0xFF29, 0xFF2A, 0xFF2B, 0xFF2C, 0xFF2D, 0xFF2E, 0xFF2F, 0xFF30, 0xFF31, 0xFF32, 0xFF33, 0xFF34, 0xFF35, 0xFF36, 0xFF37, 0xFF38, 0xFF39, 0xFF3A, 0 };
-    int i;
+	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;
+	return tbl_lower[i] ? tbl_upper[i] : chr;
 }

src/bootldr/clock.c

@@ -7,116 +7,101 @@
 #include "bits.h"
 #include "uart.h"
 
-void clock_disconnect()
+void clock_disconnect() {
-{
+  disconnectPLL0();
-    disconnectPLL0();
+  disablePLL0();
-    disablePLL0();
 }
 
-void clock_init()
+void clock_init() {
-{
 
-    /* set flash access time to 6 clks (safe setting) */
+/* set flash access time to 6 clks (safe setting) */
-    setFlashAccessTime( 6 );
+  setFlashAccessTime(6);
 
-    /* setup PLL0 for ~44100*256*8 Hz
+/* setup PLL0 for ~44100*256*8 Hz
-       Base clock: 12MHz
+   Base clock: 12MHz
-       Multiplier:  429
+   Multiplier:  429
-       Pre-Divisor:  19
+   Pre-Divisor:  19
-       Divisor:       6
+   Divisor:       6
-       (want: 90316800, get: 90315789.47)
+   (want: 90316800, get: 90315789.47)
-       -> DAC freq = 44099.5 Hz
+   -> DAC freq = 44099.5 Hz
-       -> FPGA freq = 11289473.7Hz
+   -> FPGA freq = 11289473.7Hz
-       First, disable and disconnect PLL0.
+   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.
+   reliably with PLL0 connected.
-       see:
+   see:
-       http://ics.nxp.com/support/documents/microcontrollers/pdf/errata.lpc1754.pdf
+   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
+   enable the xtal oscillator and wait for it to become stable
-       set the oscillator as clk source for PLL0
+   set the oscillator as clk source for PLL0
-       set PLL0 multiplier+predivider
+   set PLL0 multiplier+predivider
-       enable PLL0
+   enable PLL0
-       set CCLK divider
+   set CCLK divider
-       wait for PLL0 to lock
+   wait for PLL0 to lock
-       connect PLL0
+   connect PLL0
-       done
+   done
-     */
+ */
-    enableMainOsc();
+  enableMainOsc();
-    setClkSrc( CLKSRC_MAINOSC );
+  setClkSrc(CLKSRC_MAINOSC);
-    setPLL0MultPrediv( 12, 1 );
+  setPLL0MultPrediv(12, 1);
-    enablePLL0();
+  enablePLL0();
-    setCCLKDiv( 3 );
+  setCCLKDiv(3);
-    connectPLL0();
+  connectPLL0();
 }
 
-void setFlashAccessTime( uint8_t clocks )
+void setFlashAccessTime(uint8_t clocks) {
-{
+  LPC_SC->FLASHCFG=FLASHTIM(clocks);
-    LPC_SC->FLASHCFG = FLASHTIM( clocks );
 }
 
-void setPLL0MultPrediv( uint16_t mult, uint8_t prediv )
+void setPLL0MultPrediv(uint16_t mult, uint8_t prediv) {
-{
+  LPC_SC->PLL0CFG=PLL_MULT(mult) | PLL_PREDIV(prediv);
-    LPC_SC->PLL0CFG = PLL_MULT( mult ) | PLL_PREDIV( prediv );
+  PLL0feed();
-    PLL0feed();
 }
 
-void enablePLL0()
+void enablePLL0() {
-{
+  LPC_SC->PLL0CON |= PLLE0;
-    LPC_SC->PLL0CON |= PLLE0;
+  PLL0feed();
-    PLL0feed();
 }
 
-void disablePLL0()
+void disablePLL0() {
-{
+  LPC_SC->PLL0CON &= ~PLLE0;
-    LPC_SC->PLL0CON &= ~PLLE0;
+  PLL0feed();
-    PLL0feed();
 }
 
-void connectPLL0()
+void connectPLL0() {
-{
+  while(!(LPC_SC->PLL0STAT&PLOCK0));
-    while ( !( LPC_SC->PLL0STAT & PLOCK0 ) );
+  LPC_SC->PLL0CON |= PLLC0;
-
+  PLL0feed();
-    LPC_SC->PLL0CON |= PLLC0;
-    PLL0feed();
 }
 
-void disconnectPLL0()
+void disconnectPLL0() {
-{
+  LPC_SC->PLL0CON &= ~PLLC0;
-    LPC_SC->PLL0CON &= ~PLLC0;
+  PLL0feed();
-    PLL0feed();
 }
 
-void setCCLKDiv( uint8_t div )
+void setCCLKDiv(uint8_t div) {
-{
+  LPC_SC->CCLKCFG=CCLK_DIV(div);
-    LPC_SC->CCLKCFG = CCLK_DIV( div );
 }
 
-void enableMainOsc()
+void enableMainOsc() {
-{
+  LPC_SC->SCS=OSCEN;
-    LPC_SC->SCS = OSCEN;
+  while(!(LPC_SC->SCS&OSCSTAT));
-
-    while ( !( LPC_SC->SCS & OSCSTAT ) );
 }
 
-void disableMainOsc()
+void disableMainOsc() {
-{
+  LPC_SC->SCS=0;
-    LPC_SC->SCS = 0;
 }
 
-void PLL0feed()
+void PLL0feed() {
-{
+  LPC_SC->PLL0FEED=0xaa;
-    LPC_SC->PLL0FEED = 0xaa;
+  LPC_SC->PLL0FEED=0x55;
-    LPC_SC->PLL0FEED = 0x55;
 }
 
-void setClkSrc( uint8_t src )
+void setClkSrc(uint8_t src) {
-{
+  LPC_SC->CLKSRCSEL=src;
-    LPC_SC->CLKSRCSEL = src;
 }

src/bootldr/clock.h

@@ -18,62 +18,62 @@
 #define PCLK_CCLK2(x)   (2<<(x))
 
 /* shift values for use with PCLKSEL0 */
-#define PCLK_WDT    (0)
+#define PCLK_WDT	(0)
-#define PCLK_TIMER0 (2)
+#define PCLK_TIMER0	(2)
-#define PCLK_TIMER1 (4)
+#define PCLK_TIMER1	(4)
-#define PCLK_UART0  (6)
+#define PCLK_UART0	(6)
-#define PCLK_UART1  (8)
+#define PCLK_UART1	(8)
-#define PCLK_PWM1   (12)
+#define PCLK_PWM1	(12)
-#define PCLK_I2C0   (14)
+#define PCLK_I2C0	(14)
-#define PCLK_SPI    (16)
+#define PCLK_SPI	(16)
-#define PCLK_SSP1   (20)
+#define PCLK_SSP1	(20)
-#define PCLK_DAC    (22)
+#define PCLK_DAC	(22)
-#define PCLK_ADC    (24)
+#define PCLK_ADC	(24)
-#define PCLK_CAN1   (26)
+#define PCLK_CAN1	(26)
-#define PCLK_CAN2   (28)
+#define PCLK_CAN2	(28)
-#define PCLK_ACF    (30)
+#define PCLK_ACF	(30)
 
 /* shift values for use with PCLKSEL1 */
-#define PCLK_QEI    (0)
+#define PCLK_QEI	(0)
-#define PCLK_GPIOINT    (2)
+#define PCLK_GPIOINT	(2)
-#define PCLK_PCB    (4)
+#define PCLK_PCB	(4)
-#define PCLK_I2C1   (6)
+#define PCLK_I2C1	(6)
-#define PCLK_SSP0   (10)
+#define PCLK_SSP0	(10)
-#define PCLK_TIMER2 (12)
+#define PCLK_TIMER2	(12)
 #define PCLK_TIMER3     (14)
-#define PCLK_UART2  (16)
+#define PCLK_UART2	(16)
-#define PCLK_UART3  (18)
+#define PCLK_UART3	(18)
-#define PCLK_I2C2   (20)
+#define PCLK_I2C2	(20)
-#define PCLK_I2S    (22)
+#define PCLK_I2S	(22)
-#define PCLK_RIT    (26)
+#define PCLK_RIT	(26)
-#define PCLK_SYSCON (28)
+#define PCLK_SYSCON	(28)
-#define PCLK_MC     (30)
+#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 NOW\n" \
+  print "// autoconf.h generated from " ARGV[1] " at TODAY \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 {\
-        BITBANG(LPC_GPIOINT->IO2IntEnR, SD_DT_BIT) = 1;\
+                                    BITBAND(LPC_GPIOINT->IO2IntEnR, SD_DT_BIT) = 1;\
-        BITBANG(LPC_GPIOINT->IO2IntEnF, SD_DT_BIT) = 1;\
+                                    BITBAND(LPC_GPIOINT->IO2IntEnF, SD_DT_BIT) = 1;\
-    } while(0)
+                                  } while(0)
 
-#define SD_CHANGE_DETECT          (BITBANG(LPC_GPIOINT->IO2IntStatR, SD_DT_BIT)\
+#define SD_CHANGE_DETECT          (BITBAND(LPC_GPIOINT->IO2IntStatR, SD_DT_BIT)\
-                                   |BITBANG(LPC_GPIOINT->IO2IntStatF, SD_DT_BIT))
+                                   |BITBAND(LPC_GPIOINT->IO2IntStatF, SD_DT_BIT))
 
 #define SD_CHANGE_CLR()           do {LPC_GPIOINT->IO2IntClr = BV(SD_DT_BIT);} while(0)
 
@@ -41,22 +41,22 @@
 #define SD_WP_REG                 LPC_GPIO0
 #define SD_WP_BIT                 6
 
-#define SDCARD_DETECT             (!(BITBANG(SD_DT_REG->FIOPIN, SD_DT_BIT)))
+#define SDCARD_DETECT             (!(BITBAND(SD_DT_REG->FIOPIN, SD_DT_BIT)))
-#define SDCARD_WP                 (BITBANG(SD_WP_REG->FIOPIN, SD_WP_BIT))
+#define SDCARD_WP                 (BITBAND(SD_WP_REG->FIOPIN, SD_WP_BIT))
 #define SD_SUPPLY_VOLTAGE         (1L<<21) /* 3.3V - 3.4V */
 #define CONFIG_SD_BLOCKTRANSFER   1
 #define CONFIG_SD_AUTO_RETRIES    10
 // #define SD_CHANGE_VECT
 #define CONFIG_SD_DATACRC 1
 
-#define CONFIG_UART_NUM           3
+#define CONFIG_UART_NUM	          3
 // #define CONFIG_CPU_FREQUENCY      90315789
 #define CONFIG_CPU_FREQUENCY      (96000000L)
 //#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_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 );
+uint8_t crc7update(uint8_t crc, uint8_t data);
-uint16_t crc_xmodem_update( uint16_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 );
+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,19 +26,17 @@
  * \param data_len     The width of \a data expressed in number of bits.
  * \return     The reflected data.
 ******************************************************************************/
-uint32_t crc_reflect( uint32_t data, size_t data_len )
+uint32_t crc_reflect(uint32_t data, size_t data_len)
 {
     unsigned int i;
     uint32_t ret;
 
     ret = data & 0x01;
-
+    for (i = 1; i < data_len; i++)
-    for ( i = 1; i < data_len; i++ )
     {
         data >>= 1;
-        ret = ( ret << 1 ) | ( data & 0x01 );
+        ret = (ret << 1) | (data & 0x01);
     }
-
     return ret;
 }
 
@@ -51,31 +49,23 @@ uint32_t crc_reflect( uint32_t data, size_t data_len )
  * \param data_len Number of bytes in the \a data buffer.
  * \return         The updated crc value.
  *****************************************************************************/
-uint32_t crc32_update( uint32_t crc, const unsigned char data )
+uint32_t crc32_update(uint32_t crc, const unsigned char data)
 {
     unsigned int i;
     uint32_t bit;
     unsigned char c;
 
     c = data;
-
+    for (i = 0x01; i & 0xff; i <<= 1) {
-    for ( i = 0x01; i & 0xff; i <<= 1 )
-    {
         bit = crc & 0x80000000;
-
+        if (c & i) {
-        if ( c & i )
-        {
             bit = !bit;
         }
-
         crc <<= 1;
-
+        if (bit) {
-        if ( bit )
-        {
             crc ^= 0x04c11db7;
         }
     }
-
     return crc & 0xffffffff;
 }
 

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

@@ -4,8 +4,8 @@
 
 #ifndef _DISKIO
 
-#define _READONLY   0   /* 1: Remove write functions */
+#define _READONLY	0	/* 1: Remove write functions */
-#define _USE_IOCTL  1   /* 1: Use disk_ioctl fucntion */
+#define _USE_IOCTL	1	/* 1: Use disk_ioctl fucntion */
 
 #include <arm/NXP/LPC17xx/LPC17xx.h>
 
@@ -13,16 +13,15 @@
 
 
 /* Status of Disk Functions */
-typedef BYTE    DSTATUS;
+typedef BYTE	DSTATUS;
 
 /* Results of Disk Functions */
-typedef enum
+typedef enum {
-{
+	RES_OK = 0,		/* 0: Successful */
-    RES_OK = 0,     /* 0: Successful */
+	RES_ERROR,		/* 1: R/W Error */
-    RES_ERROR,      /* 1: R/W Error */
+	RES_WRPRT,		/* 2: Write Protected */
-    RES_WRPRT,      /* 2: Write Protected */
+	RES_NOTRDY,		/* 3: Not Ready */
-    RES_NOTRDY,     /* 3: Not Ready */
+	RES_PARERR		/* 4: Invalid Parameter */
-    RES_PARERR      /* 4: Invalid Parameter */
 } DRESULT;
 
 /**
@@ -36,13 +35,12 @@ 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  validbytes;
+  uint8_t  maxpage;
-    uint8_t  maxpage;
+  uint8_t  disktype;
-    uint8_t  disktype;
+  uint8_t  sectorsize;   /* divided by 256 */
-    uint8_t  sectorsize;   /* divided by 256 */
+  uint32_t sectorcount;  /* 2 TB should be enough... (512 byte sectors) */
-    uint32_t sectorcount;  /* 2 TB should be enough... (512 byte sectors) */
 } diskinfo0_t;
 
 
@@ -50,17 +48,17 @@ typedef struct
 /*---------------------------------------*/
 /* Prototypes for disk control functions */
 
-int assign_drives ( int, int );
+int assign_drives (int, int);
-DSTATUS disk_initialize ( BYTE );
+DSTATUS disk_initialize (BYTE);
-DSTATUS disk_status ( BYTE );
+DSTATUS disk_status (BYTE);
-DRESULT disk_read ( BYTE, BYTE *, DWORD, BYTE );
+DRESULT disk_read (BYTE, BYTE*, DWORD, BYTE);
-#if _READONLY == 0
+#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)
+#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 };
@@ -82,39 +80,39 @@ extern volatile enum diskstates disk_state;
 
 /* Disk Status Bits (DSTATUS) */
 
-#define STA_NOINIT      0x01    /* Drive not initialized */
+#define STA_NOINIT		0x01	/* Drive not initialized */
-#define STA_NODISK      0x02    /* No medium in the drive */
+#define STA_NODISK		0x02	/* No medium in the drive */
-#define STA_PROTECT     0x04    /* Write protected */
+#define STA_PROTECT		0x04	/* Write protected */
 
 
 /* Command code for disk_ioctrl fucntion */
 
 /* Generic command (defined for FatFs) */
-#define CTRL_SYNC           0   /* Flush disk cache (for write functions) */
+#define CTRL_SYNC			0	/* Flush disk cache (for write functions) */
-#define GET_SECTOR_COUNT    1   /* Get media size (for only f_mkfs()) */
+#define GET_SECTOR_COUNT	1	/* Get media size (for only f_mkfs()) */
-#define GET_SECTOR_SIZE     2   /* Get sector size (for multiple sector size (_MAX_SS >= 1024)) */
+#define GET_SECTOR_SIZE		2	/* Get sector size (for multiple sector size (_MAX_SS >= 1024)) */
-#define GET_BLOCK_SIZE      3   /* Get erase block size (for only f_mkfs()) */
+#define GET_BLOCK_SIZE		3	/* Get erase block size (for only f_mkfs()) */
-#define CTRL_ERASE_SECTOR   4   /* Force erased a block of sectors (for only _USE_ERASE) */
+#define CTRL_ERASE_SECTOR	4	/* Force erased a block of sectors (for only _USE_ERASE) */
 
 /* Generic command */
-#define CTRL_POWER          5   /* Get/Set power status */
+#define CTRL_POWER			5	/* Get/Set power status */
-#define CTRL_LOCK           6   /* Lock/Unlock media removal */
+#define CTRL_LOCK			6	/* Lock/Unlock media removal */
-#define CTRL_EJECT          7   /* Eject media */
+#define CTRL_EJECT			7	/* Eject media */
 
 /* MMC/SDC specific ioctl command */
-#define MMC_GET_TYPE        10  /* Get card type */
+#define MMC_GET_TYPE		10	/* Get card type */
-#define MMC_GET_CSD         11  /* Get CSD */
+#define MMC_GET_CSD			11	/* Get CSD */
-#define MMC_GET_CID         12  /* Get CID */
+#define MMC_GET_CID			12	/* Get CID */
-#define MMC_GET_OCR         13  /* Get OCR */
+#define MMC_GET_OCR			13	/* Get OCR */
-#define MMC_GET_SDSTAT      14  /* Get SD status */
+#define MMC_GET_SDSTAT		14	/* Get SD status */
 
 /* ATA/CF specific ioctl command */
-#define ATA_GET_REV         20  /* Get F/W revision */
+#define ATA_GET_REV			20	/* Get F/W revision */
-#define ATA_GET_MODEL       21  /* Get model name */
+#define ATA_GET_MODEL		21	/* Get model name */
-#define ATA_GET_SN          22  /* Get serial number */
+#define ATA_GET_SN			22	/* Get serial number */
 
 /* NAND specific ioctl command */
-#define NAND_FORMAT         30  /* Create physical format */
+#define NAND_FORMAT			30	/* Create physical format */
 
 
 #define _DISKIO

src/bootldr/faulthandler.c

@@ -2,26 +2,21 @@
 #include "config.h"
 #include "uart.h"
 
-void HardFault_Handler( void )
+void HardFault_Handler(void) {
-{
+  DBG_BL printf("HFSR: %lx\n", SCB->HFSR);
-    DBG_BL printf( "HFSR: %lx\n", SCB->HFSR );
+  DBG_UART uart_putc('H');
-    DBG_UART uart_putc( 'H' );
+  while (1) ;
-
-    while ( 1 ) ;
 }
 
-void MemManage_Handler( void )
+void MemManage_Handler(void) {
-{
+  DBG_BL printf("MemManage - CFSR: %lx; MMFAR: %lx\n", SCB->CFSR, SCB->MMFAR);
-    DBG_BL printf( "MemManage - CFSR: %lx; MMFAR: %lx\n", SCB->CFSR, SCB->MMFAR );
 }
 
-void BusFault_Handler( void )
+void BusFault_Handler(void) {
-{
+  DBG_BL printf("BusFault - CFSR: %lx; BFAR: %lx\n", SCB->CFSR, SCB->BFAR);
-    DBG_BL printf( "BusFault - CFSR: %lx; BFAR: %lx\n", SCB->CFSR, SCB->BFAR );
 }
 
-void UsageFault_Handler( void )
+void UsageFault_Handler(void) {
-{
+  DBG_BL printf("UsageFault - CFSR: %lx; BFAR: %lx\n", SCB->CFSR, SCB->BFAR);
-    DBG_BL printf( "UsageFault - CFSR: %lx; BFAR: %lx\n", SCB->CFSR, SCB->BFAR );
 }
 

src/bootldr/ff.h

@@ -15,14 +15,14 @@
 /----------------------------------------------------------------------------*/
 
 #ifndef _FATFS
-#define _FATFS  8255    /* Revision ID */
+#define _FATFS	8255	/* Revision ID */
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "integer.h"    /* Basic integer types */
+#include "integer.h"	/* Basic integer types */
-#include "ffconf.h"     /* FatFs configuration options */
+#include "ffconf.h"		/* FatFs configuration options */
 
 #if _FATFS != _FFCONF
 #error Wrong configuration file (ffconf.h).
@@ -31,191 +31,191 @@ extern "C" {
 
 /* DBCS code ranges and SBCS extend char conversion table */
 
-#if _CODE_PAGE == 932   /* Japanese Shift-JIS */
+#if _CODE_PAGE == 932	/* Japanese Shift-JIS */
-#define _DF1S   0x81    /* DBC 1st byte range 1 start */
+#define _DF1S	0x81	/* DBC 1st byte range 1 start */
-#define _DF1E   0x9F    /* DBC 1st byte range 1 end */
+#define _DF1E	0x9F	/* DBC 1st byte range 1 end */
-#define _DF2S   0xE0    /* DBC 1st byte range 2 start */
+#define _DF2S	0xE0	/* DBC 1st byte range 2 start */
-#define _DF2E   0xFC    /* DBC 1st byte range 2 end */
+#define _DF2E	0xFC	/* DBC 1st byte range 2 end */
-#define _DS1S   0x40    /* DBC 2nd byte range 1 start */
+#define _DS1S	0x40	/* DBC 2nd byte range 1 start */
-#define _DS1E   0x7E    /* DBC 2nd byte range 1 end */
+#define _DS1E	0x7E	/* DBC 2nd byte range 1 end */
-#define _DS2S   0x80    /* DBC 2nd byte range 2 start */
+#define _DS2S	0x80	/* DBC 2nd byte range 2 start */
-#define _DS2E   0xFC    /* DBC 2nd byte range 2 end */
+#define _DS2E	0xFC	/* DBC 2nd byte range 2 end */
 
-#elif _CODE_PAGE == 936 /* Simplified Chinese GBK */
+#elif _CODE_PAGE == 936	/* Simplified Chinese GBK */
-#define _DF1S   0x81
+#define _DF1S	0x81
-#define _DF1E   0xFE
+#define _DF1E	0xFE
-#define _DS1S   0x40
+#define _DS1S	0x40
-#define _DS1E   0x7E
+#define _DS1E	0x7E
-#define _DS2S   0x80
+#define _DS2S	0x80
-#define _DS2E   0xFE
+#define _DS2E	0xFE
 
-#elif _CODE_PAGE == 949 /* Korean */
+#elif _CODE_PAGE == 949	/* Korean */
-#define _DF1S   0x81
+#define _DF1S	0x81
-#define _DF1E   0xFE
+#define _DF1E	0xFE
-#define _DS1S   0x41
+#define _DS1S	0x41
-#define _DS1E   0x5A
+#define _DS1E	0x5A
-#define _DS2S   0x61
+#define _DS2S	0x61
-#define _DS2E   0x7A
+#define _DS2E	0x7A
-#define _DS3S   0x81
+#define _DS3S	0x81
-#define _DS3E   0xFE
+#define _DS3E	0xFE
 
-#elif _CODE_PAGE == 950 /* Traditional Chinese Big5 */
+#elif _CODE_PAGE == 950	/* Traditional Chinese Big5 */
-#define _DF1S   0x81
+#define _DF1S	0x81
-#define _DF1E   0xFE
+#define _DF1E	0xFE
-#define _DS1S   0x40
+#define _DS1S	0x40
-#define _DS1E   0x7E
+#define _DS1E	0x7E
-#define _DS2S   0xA1
+#define _DS2S	0xA1
-#define _DS2E   0xFE
+#define _DS2E	0xFE
 
-#elif _CODE_PAGE == 437 /* U.S. (OEM) */
+#elif _CODE_PAGE == 437	/* U.S. (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x9A,0x90,0x41,0x8E,0x41,0x8F,0x80,0x45,0x45,0x45,0x49,0x49,0x49,0x8E,0x8F,0x90,0x92,0x92,0x4F,0x99,0x4F,0x55,0x55,0x59,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-        0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
-#elif _CODE_PAGE == 720 /* Arabic (OEM) */
+#elif _CODE_PAGE == 720	/* Arabic (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x45,0x41,0x84,0x41,0x86,0x43,0x45,0x45,0x45,0x49,0x49,0x8D,0x8E,0x8F,0x90,0x92,0x92,0x93,0x94,0x95,0x49,0x49,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-        0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
-#elif _CODE_PAGE == 737 /* Greek (OEM) */
+#elif _CODE_PAGE == 737	/* Greek (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x92,0x92,0x93,0x94,0x95,0x96,0x97,0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87, \
-        0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0xAA,0x92,0x93,0x94,0x95,0x96,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0xAA,0x92,0x93,0x94,0x95,0x96,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0x97,0xEA,0xEB,0xEC,0xE4,0xED,0xEE,0xE7,0xE8,0xF1,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0x97,0xEA,0xEB,0xEC,0xE4,0xED,0xEE,0xE7,0xE8,0xF1,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
-#elif _CODE_PAGE == 775 /* Baltic (OEM) */
+#elif _CODE_PAGE == 775	/* Baltic (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x9A,0x91,0xA0,0x8E,0x95,0x8F,0x80,0xAD,0xED,0x8A,0x8A,0xA1,0x8D,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0x95,0x96,0x97,0x97,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \
-        0xA0,0xA1,0xE0,0xA3,0xA3,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xA0,0xA1,0xE0,0xA3,0xA3,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xB5,0xB6,0xB7,0xB8,0xBD,0xBE,0xC6,0xC7,0xA5,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xB5,0xB6,0xB7,0xB8,0xBD,0xBE,0xC6,0xC7,0xA5,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE3,0xE8,0xE8,0xEA,0xEA,0xEE,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE3,0xE8,0xE8,0xEA,0xEA,0xEE,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
-#elif _CODE_PAGE == 850 /* Multilingual Latin 1 (OEM) */
+#elif _CODE_PAGE == 850	/* Multilingual Latin 1 (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0xDE,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x59,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \
-        0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE7,0xE9,0xEA,0xEB,0xED,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE7,0xE9,0xEA,0xEB,0xED,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
-#elif _CODE_PAGE == 852 /* Latin 2 (OEM) */
+#elif _CODE_PAGE == 852	/* Latin 2 (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xDE,0x8F,0x80,0x9D,0xD3,0x8A,0x8A,0xD7,0x8D,0x8E,0x8F,0x90,0x91,0x91,0xE2,0x99,0x95,0x95,0x97,0x97,0x99,0x9A,0x9B,0x9B,0x9D,0x9E,0x9F, \
-        0xB5,0xD6,0xE0,0xE9,0xA4,0xA4,0xA6,0xA6,0xA8,0xA8,0xAA,0x8D,0xAC,0xB8,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBD,0xBF, \
+				0xB5,0xD6,0xE0,0xE9,0xA4,0xA4,0xA6,0xA6,0xA8,0xA8,0xAA,0x8D,0xAC,0xB8,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBD,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC6,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD2,0xD3,0xD2,0xD5,0xD6,0xD7,0xB7,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC6,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD2,0xD3,0xD2,0xD5,0xD6,0xD7,0xB7,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xE0,0xE1,0xE2,0xE3,0xE3,0xD5,0xE6,0xE6,0xE8,0xE9,0xE8,0xEB,0xED,0xED,0xDD,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xEB,0xFC,0xFC,0xFE,0xFF}
+				0xE0,0xE1,0xE2,0xE3,0xE3,0xD5,0xE6,0xE6,0xE8,0xE9,0xE8,0xEB,0xED,0xED,0xDD,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xEB,0xFC,0xFC,0xFE,0xFF}
 
-#elif _CODE_PAGE == 855 /* Cyrillic (OEM) */
+#elif _CODE_PAGE == 855	/* Cyrillic (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x81,0x81,0x83,0x83,0x85,0x85,0x87,0x87,0x89,0x89,0x8B,0x8B,0x8D,0x8D,0x8F,0x8F,0x91,0x91,0x93,0x93,0x95,0x95,0x97,0x97,0x99,0x99,0x9B,0x9B,0x9D,0x9D,0x9F,0x9F, \
-        0xA1,0xA1,0xA3,0xA3,0xA5,0xA5,0xA7,0xA7,0xA9,0xA9,0xAB,0xAB,0xAD,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB6,0xB6,0xB8,0xB8,0xB9,0xBA,0xBB,0xBC,0xBE,0xBE,0xBF, \
+				0xA1,0xA1,0xA3,0xA3,0xA5,0xA5,0xA7,0xA7,0xA9,0xA9,0xAB,0xAB,0xAD,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB6,0xB6,0xB8,0xB8,0xB9,0xBA,0xBB,0xBC,0xBE,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD3,0xD3,0xD5,0xD5,0xD7,0xD7,0xDD,0xD9,0xDA,0xDB,0xDC,0xDD,0xE0,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD3,0xD3,0xD5,0xD5,0xD7,0xD7,0xDD,0xD9,0xDA,0xDB,0xDC,0xDD,0xE0,0xDF, \
-        0xE0,0xE2,0xE2,0xE4,0xE4,0xE6,0xE6,0xE8,0xE8,0xEA,0xEA,0xEC,0xEC,0xEE,0xEE,0xEF,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF8,0xFA,0xFA,0xFC,0xFC,0xFD,0xFE,0xFF}
+				0xE0,0xE2,0xE2,0xE4,0xE4,0xE6,0xE6,0xE8,0xE8,0xEA,0xEA,0xEC,0xEC,0xEE,0xEE,0xEF,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF8,0xFA,0xFA,0xFC,0xFC,0xFD,0xFE,0xFF}
 
-#elif _CODE_PAGE == 857 /* Turkish (OEM) */
+#elif _CODE_PAGE == 857	/* Turkish (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0x98,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x98,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9E, \
-        0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA6,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA6,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xDE,0x59,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xDE,0x59,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
-#elif _CODE_PAGE == 858 /* Multilingual Latin 1 + Euro (OEM) */
+#elif _CODE_PAGE == 858	/* Multilingual Latin 1 + Euro (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0xDE,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x59,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \
-        0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE7,0xE9,0xEA,0xEB,0xED,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE7,0xE9,0xEA,0xEB,0xED,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
-#elif _CODE_PAGE == 862 /* Hebrew (OEM) */
+#elif _CODE_PAGE == 862	/* Hebrew (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-        0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
-#elif _CODE_PAGE == 866 /* Russian (OEM) */
+#elif _CODE_PAGE == 866	/* Russian (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-        0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0x90,0x91,0x92,0x93,0x9d,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,0xF0,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0x90,0x91,0x92,0x93,0x9d,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,0xF0,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
-#elif _CODE_PAGE == 874 /* Thai (OEM, Windows) */
+#elif _CODE_PAGE == 874	/* Thai (OEM, Windows) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-        0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
 #elif _CODE_PAGE == 1250 /* Central Europe (Windows) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8A,0x9B,0x8C,0x8D,0x8E,0x8F, \
-        0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xA3,0xB4,0xB5,0xB6,0xB7,0xB8,0xA5,0xAA,0xBB,0xBC,0xBD,0xBC,0xAF, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xA3,0xB4,0xB5,0xB6,0xB7,0xB8,0xA5,0xAA,0xBB,0xBC,0xBD,0xBC,0xAF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF}
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF}
 
 #elif _CODE_PAGE == 1251 /* Cyrillic (Windows) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x82,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x80,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8A,0x9B,0x8C,0x8D,0x8E,0x8F, \
-        0xA0,0xA2,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB2,0xA5,0xB5,0xB6,0xB7,0xA8,0xB9,0xAA,0xBB,0xA3,0xBD,0xBD,0xAF, \
+				0xA0,0xA2,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB2,0xA5,0xB5,0xB6,0xB7,0xA8,0xB9,0xAA,0xBB,0xA3,0xBD,0xBD,0xAF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF}
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF}
 
 #elif _CODE_PAGE == 1252 /* Latin 1 (Windows) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0xAd,0x9B,0x8C,0x9D,0xAE,0x9F, \
-        0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0x9F}
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0x9F}
 
 #elif _CODE_PAGE == 1253 /* Greek (Windows) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-        0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xA2,0xB8,0xB9,0xBA, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xA2,0xB8,0xB9,0xBA, \
-        0xE0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xF2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xFB,0xBC,0xFD,0xBF,0xFF}
+				0xE0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xF2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xFB,0xBC,0xFD,0xBF,0xFF}
 
 #elif _CODE_PAGE == 1254 /* Turkish (Windows) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8A,0x9B,0x8C,0x9D,0x9E,0x9F, \
-        0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0x9F}
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0x9F}
 
 #elif _CODE_PAGE == 1255 /* Hebrew (Windows) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-        0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
 #elif _CODE_PAGE == 1256 /* Arabic (Windows) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x8C,0x9D,0x9E,0x9F, \
-        0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0x41,0xE1,0x41,0xE3,0xE4,0xE5,0xE6,0x43,0x45,0x45,0x45,0x45,0xEC,0xED,0x49,0x49,0xF0,0xF1,0xF2,0xF3,0x4F,0xF5,0xF6,0xF7,0xF8,0x55,0xFA,0x55,0x55,0xFD,0xFE,0xFF}
+				0x41,0xE1,0x41,0xE3,0xE4,0xE5,0xE6,0x43,0x45,0x45,0x45,0x45,0xEC,0xED,0x49,0x49,0xF0,0xF1,0xF2,0xF3,0x4F,0xF5,0xF6,0xF7,0xF8,0x55,0xFA,0x55,0x55,0xFD,0xFE,0xFF}
 
 #elif _CODE_PAGE == 1257 /* Baltic (Windows) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-        0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xA8,0xB9,0xAA,0xBB,0xBC,0xBD,0xBE,0xAF, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xA8,0xB9,0xAA,0xBB,0xBC,0xBD,0xBE,0xAF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF}
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF}
 
 #elif _CODE_PAGE == 1258 /* Vietnam (OEM, Windows) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0xAC,0x9D,0x9E,0x9F, \
-        0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xEC,0xCD,0xCE,0xCF,0xD0,0xD1,0xF2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xFE,0x9F}
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xEC,0xCD,0xCE,0xCF,0xD0,0xD1,0xF2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xFE,0x9F}
 
-#elif _CODE_PAGE == 1   /* ASCII (for only non-LFN cfg) */
+#elif _CODE_PAGE == 1	/* ASCII (for only non-LFN cfg) */
-#define _DF1S   0
+#define _DF1S	0
 
 #else
 #error Unknown code page
@@ -226,19 +226,18 @@ extern "C" {
 
 /* Definitions of volume management */
 
-#if _MULTI_PARTITION        /* Multiple partition configuration */
+#if _MULTI_PARTITION		/* Multiple partition configuration */
-#define LD2PD(vol) (VolToPart[vol].pd)  /* Get physical drive# */
+#define LD2PD(vol) (VolToPart[vol].pd)	/* Get physical drive# */
-#define LD2PT(vol) (VolToPart[vol].pt)  /* Get partition# */
+#define LD2PT(vol) (VolToPart[vol].pt)	/* Get partition# */
-typedef struct
+typedef struct {
-{
+	BYTE pd;	/* Physical drive# */
-    BYTE pd;    /* Physical drive# */
+	BYTE pt;	/* Partition # (0-3) */
-    BYTE pt;    /* Partition # (0-3) */
 } PARTITION;
-extern const PARTITION VolToPart[]; /* Volume - Physical location resolution table */
+extern const PARTITION VolToPart[];	/* Volume - Physical location resolution table */
 
-#else                       /* Single partition configuration */
+#else						/* Single partition configuration */
-#define LD2PD(vol) (vol)    /* Logical drive# is bound to the same physical drive# */
+#define LD2PD(vol) (vol)	/* Logical drive# is bound to the same physical drive# */
-#define LD2PT(vol) 0        /* Always mounts the 1st partition */
+#define LD2PT(vol) 0		/* Always mounts the 1st partition */
 
 #endif
 
@@ -246,7 +245,7 @@ extern const PARTITION VolToPart[]; /* Volume - Physical location resolution tab
 
 /* Type of path name strings on FatFs API */
 
-#if _LFN_UNICODE            /* Unicode string */
+#if _LFN_UNICODE			/* Unicode string */
 #if !_USE_LFN
 #error _LFN_UNICODE must be 0 in non-LFN cfg.
 #endif
@@ -256,7 +255,7 @@ typedef WCHAR TCHAR;
 #define _TEXT(x) L ## x
 #endif
 
-#else                       /* ANSI/OEM string */
+#else						/* ANSI/OEM string */
 #ifndef _INC_TCHAR
 typedef char TCHAR;
 #define _T(x) x
@@ -269,66 +268,64 @@ typedef char TCHAR;
 
 /* File system object structure (FATFS) */
 
-typedef struct
+typedef struct {
-{
+	BYTE	fs_type;		/* FAT sub-type (0:Not mounted) */
-    BYTE    fs_type;        /* FAT sub-type (0:Not mounted) */
+	BYTE	drv;			/* Physical drive number */
-    BYTE    drv;            /* Physical drive number */
+	BYTE	csize;			/* Sectors per cluster (1,2,4...128) */
-    BYTE    csize;          /* Sectors per cluster (1,2,4...128) */
+	BYTE	n_fats;			/* Number of FAT copies (1,2) */
-    BYTE    n_fats;         /* Number of FAT copies (1,2) */
+	BYTE	wflag;			/* win[] dirty flag (1:must be written back) */
-    BYTE    wflag;          /* win[] dirty flag (1:must be written back) */
+	BYTE	fsi_flag;		/* fsinfo dirty flag (1:must be written back) */
-    BYTE    fsi_flag;       /* fsinfo dirty flag (1:must be written back) */
+	WORD	id;				/* File system mount ID */
-    WORD    id;             /* File system mount ID */
+	WORD	n_rootdir;		/* Number of root directory entries (FAT12/16) */
-    WORD    n_rootdir;      /* Number of root directory entries (FAT12/16) */
 #if _MAX_SS != 512
-    WORD    ssize;          /* Bytes per sector (512,1024,2048,4096) */
+	WORD	ssize;			/* Bytes per sector (512,1024,2048,4096) */
 #endif
 #if _FS_REENTRANT
-    _SYNC_t sobj;           /* Identifier of sync object */
+	_SYNC_t	sobj;			/* Identifier of sync object */
 #endif
 #if !_FS_READONLY
-    DWORD   last_clust;     /* Last allocated cluster */
+	DWORD	last_clust;		/* Last allocated cluster */
-    DWORD   free_clust;     /* Number of free clusters */
+	DWORD	free_clust;		/* Number of free clusters */
-    DWORD   fsi_sector;     /* fsinfo sector (FAT32) */
+	DWORD	fsi_sector;		/* fsinfo sector (FAT32) */
 #endif
 #if _FS_RPATH
-    DWORD   cdir;           /* Current directory start cluster (0:root) */
+	DWORD	cdir;			/* Current directory start cluster (0:root) */
 #endif
-    DWORD   n_fatent;       /* Number of FAT entries (= number of clusters + 2) */
+	DWORD	n_fatent;		/* Number of FAT entries (= number of clusters + 2) */
-    DWORD   fsize;          /* Sectors per FAT */
+	DWORD	fsize;			/* Sectors per FAT */
-    DWORD   fatbase;        /* FAT start sector */
+	DWORD	fatbase;		/* FAT start sector */
-    DWORD   dirbase;        /* Root directory start sector (FAT32:Cluster#) */
+	DWORD	dirbase;		/* Root directory start sector (FAT32:Cluster#) */
-    DWORD   database;       /* Data start sector */
+	DWORD	database;		/* Data start sector */
-    DWORD   winsect;        /* Current sector appearing in the win[] */
+	DWORD	winsect;		/* Current sector appearing in the win[] */
-    BYTE    win[_MAX_SS];   /* Disk access window for Directory, FAT (and Data on tiny cfg) */
+	BYTE	win[_MAX_SS];	/* Disk access window for Directory, FAT (and Data on tiny cfg) */
 } FATFS;
 
 
 
 /* File object structure (FIL) */
 
-typedef struct
+typedef struct {
-{
+	FATFS*	fs;				/* Pointer to the owner file system object */
-    FATFS  *fs;             /* Pointer to the owner file system object */
+	WORD	id;				/* Owner file system mount ID */
-    WORD    id;             /* Owner file system mount ID */
+	BYTE	flag;			/* File status flags */
-    BYTE    flag;           /* File status flags */
+	BYTE	pad1;
-    BYTE    pad1;
+	DWORD	fptr;			/* File read/write pointer (0 on file open) */
-    DWORD   fptr;           /* File read/write pointer (0 on file open) */
+	DWORD	fsize;			/* File size */
-    DWORD   fsize;          /* File size */
+	DWORD	org_clust;		/* File start cluster (0 when fsize==0) */
-    DWORD   org_clust;      /* File start cluster (0 when fsize==0) */
+	DWORD	curr_clust;		/* Current cluster */
-    DWORD   curr_clust;     /* Current cluster */
+	DWORD	dsect;			/* Current data sector */
-    DWORD   dsect;          /* Current data sector */
 #if !_FS_READONLY
-    DWORD   dir_sect;       /* Sector containing the directory entry */
+	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) */
+	UINT	lockid;			/* File lock ID (index of file semaphore table) */
 #endif
 #if !_FS_TINY
-    BYTE    buf[_MAX_SS];   /* File data read/write buffer */
+	BYTE	buf[_MAX_SS];	/* File data read/write buffer */
 #endif
 } FIL;
 
@@ -336,19 +333,18 @@ typedef struct
 
 /* Directory object structure (DIR) */
 
-typedef struct
+typedef struct {
-{
+	FATFS*	fs;				/* Pointer to the owner file system object */
-    FATFS  *fs;             /* Pointer to the owner file system object */
+	WORD	id;				/* Owner file system mount ID */
-    WORD    id;             /* Owner file system mount ID */
+	WORD	index;			/* Current read/write index number */
-    WORD    index;          /* Current read/write index number */
+	DWORD	sclust;			/* Table start cluster (0:Root dir) */
-    DWORD   sclust;         /* Table start cluster (0:Root dir) */
+	DWORD	clust;			/* Current cluster */
-    DWORD   clust;          /* Current cluster */
+	DWORD	sect;			/* Current sector */
-    DWORD   sect;           /* Current sector */
+	BYTE*	dir;			/* Pointer to the current SFN entry in the win[] */
-    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   *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) */
+	WORD	lfn_idx;		/* Last matched LFN index number (0xFFFF:No LFN) */
 #endif
 } DIR;
 
@@ -356,17 +352,16 @@ typedef struct
 
 /* File status structure (FILINFO) */
 
-typedef struct
+typedef struct {
-{
+	DWORD	fsize;			/* File size */
-    DWORD   fsize;          /* File size */
+	WORD	fdate;			/* Last modified date */
-    WORD    fdate;          /* Last modified date */
+	WORD	ftime;			/* Last modified time */
-    WORD    ftime;          /* Last modified time */
+	BYTE	fattrib;		/* Attribute */
-    BYTE    fattrib;        /* Attribute */
+	TCHAR	fname[13];		/* Short file name (8.3 format) */
-    TCHAR   fname[13];      /* Short file name (8.3 format) */
+	DWORD	clust;			/* start cluster */
-    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 */
+	UINT 	lfsize;			/* Size of LFN buffer in TCHAR */
 #endif
 } FILINFO;
 
@@ -374,27 +369,26 @@ typedef struct
 
 /* File function return code (FRESULT) */
 
-typedef enum
+typedef enum {
-{
+	FR_OK = 0,				/* (0) Succeeded */
-    FR_OK = 0,              /* (0) Succeeded */
+	FR_DISK_ERR,			/* (1) A hard error occured in the low level disk I/O layer */
-    FR_DISK_ERR,            /* (1) A hard error occured in the low level disk I/O layer */
+	FR_INT_ERR,				/* (2) Assertion failed */
-    FR_INT_ERR,             /* (2) Assertion failed */
+	FR_NOT_READY,			/* (3) The physical drive cannot work */
-    FR_NOT_READY,           /* (3) The physical drive cannot work */
+	FR_NO_FILE,				/* (4) Could not find the file */
-    FR_NO_FILE,             /* (4) Could not find the file */
+	FR_NO_PATH,				/* (5) Could not find the path */
-    FR_NO_PATH,             /* (5) Could not find the path */
+	FR_INVALID_NAME,		/* (6) The path name format is invalid */
-    FR_INVALID_NAME,        /* (6) The path name format is invalid */
+	FR_DENIED,				/* (7) Acces denied due to prohibited access or directory full */
-    FR_DENIED,              /* (7) Acces denied due to prohibited access or directory full */
+	FR_EXIST,				/* (8) Acces denied due to prohibited access */
-    FR_EXIST,               /* (8) Acces denied due to prohibited access */
+	FR_INVALID_OBJECT,		/* (9) The file/directory object is invalid */
-    FR_INVALID_OBJECT,      /* (9) The file/directory object is invalid */
+	FR_WRITE_PROTECTED,		/* (10) The physical drive is write protected */
-    FR_WRITE_PROTECTED,     /* (10) The physical drive is write protected */
+	FR_INVALID_DRIVE,		/* (11) The logical drive number is invalid */
-    FR_INVALID_DRIVE,       /* (11) The logical drive number is invalid */
+	FR_NOT_ENABLED,			/* (12) The volume has no work area */
-    FR_NOT_ENABLED,         /* (12) The volume has no work area */
+	FR_NO_FILESYSTEM,		/* (13) There is no valid FAT volume on the physical drive */
-    FR_NO_FILESYSTEM,       /* (13) There is no valid FAT volume on the physical drive */
+	FR_MKFS_ABORTED,		/* (14) The f_mkfs() aborted due to any parameter error */
-    FR_MKFS_ABORTED,        /* (14) The f_mkfs() aborted due to any parameter error */
+	FR_TIMEOUT,				/* (15) Could not get a grant to access the volume within defined period */
-    FR_TIMEOUT,             /* (15) Could not get a grant to access the volume within defined period */
+	FR_LOCKED,				/* (16) The operation is rejected according to the file shareing policy */
-    FR_LOCKED,              /* (16) The operation is rejected according to the file shareing policy */
+	FR_NOT_ENOUGH_CORE,		/* (17) LFN working buffer could not be allocated */
-    FR_NOT_ENOUGH_CORE,     /* (17) LFN working buffer could not be allocated */
+	FR_TOO_MANY_OPEN_FILES	/* (18) Number of open files > _FS_SHARE */
-    FR_TOO_MANY_OPEN_FILES  /* (18) Number of open files > _FS_SHARE */
 } FRESULT;
 
 
@@ -403,50 +397,49 @@ typedef enum
 /* FatFs module application interface                           */
 
 /* Low Level functions */
-FRESULT l_openfilebycluster( FATFS *fs, FIL *fp, const TCHAR *path, DWORD clust,
+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 */
-                             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_mount (BYTE, FATFS*);						/* Mount/Unmount a logical drive */
-FRESULT f_open ( FIL *, const TCHAR *, BYTE );      /* Open or create a file */
+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_read (FIL*, void*, UINT, UINT*);			/* Read data from a file */
-FRESULT f_lseek ( FIL *, DWORD );                   /* Move file pointer of a file object */
+FRESULT f_lseek (FIL*, DWORD);						/* Move file pointer of a file object */
-FRESULT f_close ( FIL * );                          /* Close an open file object */
+FRESULT f_close (FIL*);								/* Close an open file object */
-FRESULT f_opendir ( DIR *, const TCHAR * );         /* Open an existing directory */
+FRESULT f_opendir (DIR*, const TCHAR*);				/* Open an existing directory */
-FRESULT f_readdir ( DIR *, FILINFO * );             /* Read a directory item */
+FRESULT f_readdir (DIR*, FILINFO*);					/* Read a directory item */
-FRESULT f_stat ( const TCHAR *, FILINFO * );        /* Get file status */
+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_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_getfree (const TCHAR*, DWORD*, FATFS**);	/* Get number of free clusters on the drive */
-FRESULT f_truncate ( FIL * );                       /* Truncate file */
+FRESULT f_truncate (FIL*);							/* Truncate file */
-FRESULT f_sync ( FIL * );                           /* Flush cached data of a writing 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_unlink (const TCHAR*);					/* Delete an existing file or directory */
-FRESULT f_mkdir ( const TCHAR * );                  /* Create a new 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_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_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_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_chdrive (BYTE);							/* Change current drive */
-FRESULT f_chdir ( const TCHAR * );                  /* Change current directory */
+FRESULT f_chdir (const TCHAR*);						/* Change current directory */
-FRESULT f_getcwd ( TCHAR *, UINT );                 /* Get 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_putc (TCHAR, FIL*);							/* Put a character to the file */
-int f_puts ( const TCHAR *, FIL * );                /* Put a string 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 */
+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 */
+TCHAR* f_gets (TCHAR*, int, FIL*);					/* Get a string from the file */
 #ifndef EOF
 #define EOF (-1)
 #endif
@@ -464,25 +457,25 @@ TCHAR *f_gets ( TCHAR *, int, FIL * );              /* Get a string from the fil
 
 /* RTC function */
 #if !_FS_READONLY
-DWORD get_fattime ( void );
+DWORD get_fattime (void);
 #endif
 
 /* Unicode support functions */
-#if _USE_LFN                        /* Unicode - OEM code conversion */
+#if _USE_LFN						/* Unicode - OEM code conversion */
-WCHAR ff_convert ( WCHAR, UINT );   /* OEM-Unicode bidirectional conversion */
+WCHAR ff_convert (WCHAR, UINT);		/* OEM-Unicode bidirectional conversion */
-WCHAR ff_wtoupper ( WCHAR );        /* Unicode upper-case conversion */
+WCHAR ff_wtoupper (WCHAR);			/* Unicode upper-case conversion */
-#if _USE_LFN == 3                   /* Memory functions */
+#if _USE_LFN == 3					/* Memory functions */
-void *ff_memalloc ( UINT );         /* Allocate memory block */
+void* ff_memalloc (UINT);			/* Allocate memory block */
-void ff_memfree ( void * );         /* Free 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_cre_syncobj (BYTE, _SYNC_t*);/* Create a sync object */
-int ff_del_syncobj ( _SYNC_t );     /* Delete a sync object */
+int ff_del_syncobj (_SYNC_t);		/* Delete a sync object */
-int ff_req_grant ( _SYNC_t );       /* Lock sync object */
+int ff_req_grant (_SYNC_t);			/* Lock sync object */
-void ff_rel_grant ( _SYNC_t );      /* Unlock sync object */
+void ff_rel_grant (_SYNC_t);		/* Unlock sync object */
 #endif
 
 
@@ -494,56 +487,56 @@ void ff_rel_grant ( _SYNC_t );      /* Unlock sync object */
 
 /* File access control and file status flags (FIL.flag) */
 
-#define FA_READ             0x01
+#define	FA_READ				0x01
-#define FA_OPEN_EXISTING    0x00
+#define	FA_OPEN_EXISTING	0x00
-#define FA__ERROR           0x80
+#define FA__ERROR			0x80
 
 #if !_FS_READONLY
-#define FA_WRITE            0x02
+#define	FA_WRITE			0x02
-#define FA_CREATE_NEW       0x04
+#define	FA_CREATE_NEW		0x04
-#define FA_CREATE_ALWAYS    0x08
+#define	FA_CREATE_ALWAYS	0x08
-#define FA_OPEN_ALWAYS      0x10
+#define	FA_OPEN_ALWAYS		0x10
-#define FA__WRITTEN         0x20
+#define FA__WRITTEN			0x20
-#define FA__DIRTY           0x40
+#define FA__DIRTY			0x40
 #endif
 
 
 /* FAT sub type (FATFS.fs_type) */
 
-#define FS_FAT12    1
+#define FS_FAT12	1
-#define FS_FAT16    2
+#define FS_FAT16	2
-#define FS_FAT32    3
+#define FS_FAT32	3
 
 
 /* File attribute bits for directory entry */
 
-#define AM_RDO  0x01    /* Read only */
+#define	AM_RDO	0x01	/* Read only */
-#define AM_HID  0x02    /* Hidden */
+#define	AM_HID	0x02	/* Hidden */
-#define AM_SYS  0x04    /* System */
+#define	AM_SYS	0x04	/* System */
-#define AM_VOL  0x08    /* Volume label */
+#define	AM_VOL	0x08	/* Volume label */
-#define AM_LFN  0x0F    /* LFN entry */
+#define AM_LFN	0x0F	/* LFN entry */
-#define AM_DIR  0x10    /* Directory */
+#define AM_DIR	0x10	/* Directory */
-#define AM_ARC  0x20    /* Archive */
+#define AM_ARC	0x20	/* Archive */
-#define AM_MASK 0x3F    /* Mask of defined bits */
+#define AM_MASK	0x3F	/* Mask of defined bits */
 
 
 /* Fast seek function */
-#define CREATE_LINKMAP  0xFFFFFFFF
+#define CREATE_LINKMAP	0xFFFFFFFF
 
 
 /*--------------------------------*/
 /* Multi-byte word access macros  */
 
-#if _WORD_ACCESS == 1   /* Enable word access to the FAT structure */
+#if _WORD_ACCESS == 1	/* Enable word access to the FAT structure */
-#define LD_WORD(ptr)        (WORD)(*(WORD*)(BYTE*)(ptr))
+#define	LD_WORD(ptr)		(WORD)(*(WORD*)(BYTE*)(ptr))
-#define LD_DWORD(ptr)       (DWORD)(*(DWORD*)(BYTE*)(ptr))
+#define	LD_DWORD(ptr)		(DWORD)(*(DWORD*)(BYTE*)(ptr))
-#define ST_WORD(ptr,val)    *(WORD*)(BYTE*)(ptr)=(WORD)(val)
+#define	ST_WORD(ptr,val)	*(WORD*)(BYTE*)(ptr)=(WORD)(val)
-#define ST_DWORD(ptr,val)   *(DWORD*)(BYTE*)(ptr)=(DWORD)(val)
+#define	ST_DWORD(ptr,val)	*(DWORD*)(BYTE*)(ptr)=(DWORD)(val)
-#else                   /* Use byte-by-byte access to the FAT structure */
+#else					/* Use byte-by-byte access to the FAT structure */
-#define LD_WORD(ptr)        (WORD)(((WORD)*(BYTE*)((ptr)+1)<<8)|(WORD)*(BYTE*)(ptr))
+#define	LD_WORD(ptr)		(WORD)(((WORD)*(BYTE*)((ptr)+1)<<8)|(WORD)*(BYTE*)(ptr))
-#define LD_DWORD(ptr)       (DWORD)(((DWORD)*(BYTE*)((ptr)+3)<<24)|((DWORD)*(BYTE*)((ptr)+2)<<16)|((WORD)*(BYTE*)((ptr)+1)<<8)|*(BYTE*)(ptr))
+#define	LD_DWORD(ptr)		(DWORD)(((DWORD)*(BYTE*)((ptr)+3)<<24)|((DWORD)*(BYTE*)((ptr)+2)<<16)|((WORD)*(BYTE*)((ptr)+1)<<8)|*(BYTE*)(ptr))
-#define ST_WORD(ptr,val)    *(BYTE*)(ptr)=(BYTE)(val); *(BYTE*)((ptr)+1)=(BYTE)((WORD)(val)>>8)
+#define	ST_WORD(ptr,val)	*(BYTE*)(ptr)=(BYTE)(val); *(BYTE*)((ptr)+1)=(BYTE)((WORD)(val)>>8)
-#define ST_DWORD(ptr,val)   *(BYTE*)(ptr)=(BYTE)(val); *(BYTE*)((ptr)+1)=(BYTE)((WORD)(val)>>8); *(BYTE*)((ptr)+2)=(BYTE)((DWORD)(val)>>16); *(BYTE*)((ptr)+3)=(BYTE)((DWORD)(val)>>24)
+#define	ST_DWORD(ptr,val)	*(BYTE*)(ptr)=(BYTE)(val); *(BYTE*)((ptr)+1)=(BYTE)((WORD)(val)>>8); *(BYTE*)((ptr)+2)=(BYTE)((DWORD)(val)>>16); *(BYTE*)((ptr)+3)=(BYTE)((DWORD)(val)>>24)
 #endif
 
 #ifdef __cplusplus

src/bootldr/ffconf.h

@@ -7,26 +7,26 @@
 /
 /----------------------------------------------------------------------------*/
 #ifndef _FFCONF
-#define _FFCONF 8255    /* Revision ID */
+#define _FFCONF 8255	/* Revision ID */
 
 
 /*---------------------------------------------------------------------------/
 / Function and Buffer Configurations
 /----------------------------------------------------------------------------*/
 
-#define _FS_TINY    1       /* 0:Normal or 1:Tiny */
+#define	_FS_TINY	1		/* 0:Normal or 1:Tiny */
 /* When _FS_TINY is set to 1, FatFs uses the sector buffer in the file system
 /  object instead of the sector buffer in the individual file object for file
 /  data transfer. This reduces memory consumption 512 bytes each file object. */
 
 
-#define _FS_READONLY    1   /* 0:Read/Write or 1:Read only */
+#define _FS_READONLY	1	/* 0:Read/Write or 1:Read only */
 /* Setting _FS_READONLY to 1 defines read only configuration. This removes
 /  writing functions, f_write, f_sync, f_unlink, f_mkdir, f_chmod, f_rename,
 /  f_truncate and useless f_getfree. */
 
 
-#define _FS_MINIMIZE    3   /* 0 to 3 */
+#define _FS_MINIMIZE	3	/* 0 to 3 */
 /* The _FS_MINIMIZE option defines minimization level to remove some functions.
 /
 /   0: Full function.
@@ -36,19 +36,19 @@
 /   3: f_lseek is removed in addition to 2. */
 
 
-#define _USE_STRFUNC    0   /* 0:Disable or 1/2:Enable */
+#define	_USE_STRFUNC	0	/* 0:Disable or 1/2:Enable */
 /* To enable string functions, set _USE_STRFUNC to 1 or 2. */
 
 
-#define _USE_MKFS   0       /* 0:Disable or 1:Enable */
+#define	_USE_MKFS	0		/* 0:Disable or 1:Enable */
 /* To enable f_mkfs function, set _USE_MKFS to 1 and set _FS_READONLY to 0 */
 
 
-#define _USE_FORWARD    0   /* 0:Disable or 1:Enable */
+#define	_USE_FORWARD	0	/* 0:Disable or 1:Enable */
 /* To enable f_forward function, set _USE_FORWARD to 1 and set _FS_TINY to 1. */
 
 
-#define _USE_FASTSEEK   0   /* 0:Disable or 1:Enable */
+#define	_USE_FASTSEEK	0	/* 0:Disable or 1:Enable */
 /* To enable fast seek feature, set _USE_FASTSEEK to 1. */
 
 
@@ -57,7 +57,7 @@
 / Locale and Namespace Configurations
 /----------------------------------------------------------------------------*/
 
-#define _CODE_PAGE  1
+#define _CODE_PAGE	1
 /* The _CODE_PAGE specifies the OEM code page to be used on the target system.
 /  Incorrect setting of the code page can cause a file open failure.
 /
@@ -86,12 +86,12 @@
 /   857  - Turkish (OEM)
 /   862  - Hebrew (OEM)
 /   874  - Thai (OEM, Windows)
-/   1    - ASCII only (Valid for non LFN cfg.)
+/	1    - ASCII only (Valid for non LFN cfg.)
 */
 
 
-#define _USE_LFN    0       /* 0 to 3 */
+#define	_USE_LFN	0		/* 0 to 3 */
-#define _MAX_LFN    255     /* Maximum LFN length to handle (12 to 255) */
+#define	_MAX_LFN	255		/* Maximum LFN length to handle (12 to 255) */
 /* The _USE_LFN option switches the LFN support.
 /
 /   0: Disable LFN feature. _MAX_LFN and _LFN_UNICODE have no effect.
@@ -105,12 +105,12 @@
 /  ff_memalloc() and ff_memfree() must be added to the project. */
 
 
-#define _LFN_UNICODE    0   /* 0:ANSI/OEM or 1:Unicode */
+#define	_LFN_UNICODE	0	/* 0:ANSI/OEM or 1:Unicode */
 /* To switch the character code set on FatFs API to Unicode,
 /  enable LFN feature and set _LFN_UNICODE to 1. */
 
 
-#define _FS_RPATH   0       /* 0 to 2 */
+#define _FS_RPATH	0		/* 0 to 2 */
 /* The _FS_RPATH option configures relative path feature.
 /
 /   0: Disable relative path feature and remove related functions.
@@ -125,11 +125,11 @@
 / Physical Drive Configurations
 /----------------------------------------------------------------------------*/
 
-#define _VOLUMES    1
+#define _VOLUMES	1
 /* Number of volumes (logical drives) to be used. */
 
 
-#define _MAX_SS     512     /* 512, 1024, 2048 or 4096 */
+#define	_MAX_SS		512		/* 512, 1024, 2048 or 4096 */
 /* Maximum sector size to be handled.
 /  Always set 512 for memory card and hard disk but a larger value may be
 /  required for floppy disk (512/1024) and optical disk (512/2048).
@@ -137,13 +137,13 @@
 /  to the disk_ioctl function. */
 
 
-#define _MULTI_PARTITION    0   /* 0:Single partition or 1:Multiple partition */
+#define	_MULTI_PARTITION	0	/* 0:Single partition or 1:Multiple partition */
 /* When set to 0, each volume is bound to the same physical drive number and
 / it can mount only first primaly partition. When it is set to 1, each volume
 / is tied to the partitions listed in VolToPart[]. */
 
 
-#define _USE_ERASE  0   /* 0:Disable or 1:Enable */
+#define	_USE_ERASE	0	/* 0:Disable or 1:Enable */
 /* To enable sector erase feature, set _USE_ERASE to 1. */
 
 
@@ -152,7 +152,7 @@
 / System Configurations
 /----------------------------------------------------------------------------*/
 
-#define _WORD_ACCESS    0   /* 0 or 1 */
+#define _WORD_ACCESS	0	/* 0 or 1 */
 /* Set 0 first and it is always compatible with all platforms. The _WORD_ACCESS
 /  option defines which access method is used to the word data on the FAT volume.
 /
@@ -168,9 +168,9 @@
 /* Include a header file here to define sync object types on the O/S */
 /* #include <windows.h>, <ucos_ii.h.h>, <semphr.h> or ohters. */
 
-#define _FS_REENTRANT   0       /* 0:Disable or 1:Enable */
+#define _FS_REENTRANT	0		/* 0:Disable or 1:Enable */
-#define _FS_TIMEOUT     1000    /* Timeout period in unit of time ticks */
+#define _FS_TIMEOUT		1000	/* Timeout period in unit of time ticks */
-#define _SYNC_t         HANDLE  /* O/S dependent type of sync object. e.g. HANDLE, OS_EVENT*, ID and etc.. */
+#define	_SYNC_t			HANDLE	/* O/S dependent type of sync object. e.g. HANDLE, OS_EVENT*, ID and etc.. */
 
 /* The _FS_REENTRANT option switches the reentrancy of the FatFs module.
 /
@@ -180,7 +180,7 @@
 /      function must be added to the project. */
 
 
-#define _FS_SHARE   0   /* 0:Disable or >=1:Enable */
+#define	_FS_SHARE	0	/* 0:Disable or >=1:Enable */
 /* To enable file shareing feature, set _FS_SHARE to 1 or greater. The value
    defines how many files can be opened simultaneously. */
 

src/bootldr/fileops.c

@@ -12,47 +12,39 @@ WCHAR ff_convert(WCHAR w, UINT dir) {
 
 int newcard;
 
-void file_init()
+void file_init() {
-{
+  file_res=f_mount(0, &fatfs);
-    file_res = f_mount( 0, &fatfs );
+  newcard = 0;
-    newcard = 0;
 }
 
-void file_reinit( void )
+void file_reinit(void) {
-{
+  disk_init();
-    disk_init();
+  file_init();
-    file_init();
 }
 
-void file_open_by_filinfo( FILINFO *fno )
+void file_open_by_filinfo(FILINFO* fno) {
-{
+  file_res = l_openfilebycluster(&fatfs, &file_handle, (TCHAR*)"", fno->clust, fno->fsize);
-    file_res = l_openfilebycluster( &fatfs, &file_handle, ( TCHAR * )"", fno->clust, fno->fsize );
 }
 
-void file_open( uint8_t *filename, BYTE flags )
+void file_open(uint8_t* filename, BYTE flags) {
-{
+  if (disk_state == DISK_CHANGED) {
-    if ( disk_state == DISK_CHANGED )
+    file_reinit();
-    {
+    newcard = 1;
-        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_status = file_res ? FILE_ERR : FILE_OK;
-    file_block_off = sizeof( file_buf );
-    file_block_max = sizeof( file_buf );
-    file_status = file_res ? FILE_ERR : FILE_OK;
 }
 
-void file_close()
+void file_close() {
-{
+  file_res = f_close(&file_handle);
-    file_res = f_close( &file_handle );
 }
 
-UINT file_read()
+UINT file_read() {
-{
+  UINT bytes_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;
-    return bytes_read;
 }
 
 /*UINT file_write() {
@@ -64,18 +56,14 @@ 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;
-    UINT bytes_read;
+  file_res = f_lseek(&file_handle, addr);
-    file_res = f_lseek( &file_handle, addr );
+  if(file_handle.fptr != addr) {
-
+    return 0;
-    if ( file_handle.fptr != addr )
+  }
-    {
+  file_res = f_read(&file_handle, buf, size, &bytes_read);
-        return 0;
+  return 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) {
@@ -86,19 +74,11 @@ UINT file_readblock( void *buf, uint32_t addr, uint16_t size )
   return bytes_written;
 }*/
 
-uint8_t file_getc()
+uint8_t file_getc() {
-{
+  if(file_block_off == file_block_max) {
-    if ( file_block_off == file_block_max )
+    file_block_max = file_read();
-    {
+    if(file_block_max == 0) file_status = FILE_EOF;
-        file_block_max = file_read();
+    file_block_off = 0;
-
+  }
-        if ( file_block_max == 0 )
+  return file_buf[file_block_off++];
-        {
-            file_status = FILE_EOF;
-        }
-
-        file_block_off = 0;
-    }
-
-    return file_buf[file_block_off++];
 }

src/bootldr/fileops.h

@@ -29,25 +29,26 @@
 #include <arm/NXP/LPC17xx/LPC17xx.h>
 #include "ff.h"
 
-enum filestates { FILE_OK = 0, FILE_ERR, FILE_EOF };
+enum filestates { FILE_OK=0, FILE_ERR, FILE_EOF };
 
 #define GCC_ALIGN_WORKAROUND __attribute__ ((aligned(4)))
-extern BYTE file_buf[512];
+BYTE file_buf[512] GCC_ALIGN_WORKAROUND;
-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 );
+FATFS fatfs;
-void file_open( uint8_t *filename, BYTE flags );
+FIL file_handle;
-void file_open_by_filinfo( FILINFO *fno );
+FRESULT file_res;
-void file_close( void );
+uint8_t file_lfn[258];
-UINT file_read( void );
+uint16_t file_block_off, file_block_max;
-UINT file_write( void );
+enum filestates file_status;
-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 );
+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);
 #endif

src/bootldr/iap.c

@@ -12,284 +12,197 @@ uint32_t iap_cmd[5];
 uint32_t iap_res[5];
 uint32_t flash_sig[4];
 
-IAP iap_entry = ( IAP ) IAP_LOCATION;
+IAP iap_entry = (IAP) IAP_LOCATION;
 
-uint32_t calc_flash_crc( uint32_t start, uint32_t len )
+uint32_t calc_flash_crc(uint32_t start, uint32_t len) {
-{
+  DBG_BL printf("calc_flash_crc(%08lx, %08lx) {\n", start, len);
-    DBG_BL printf( "calc_flash_crc(%08lx, %08lx) {\n", start, len );
+  uint32_t end = start + len;
-    uint32_t end = start + len;
+  if(end > 0x20000) {
-
+    len = 0x1ffff - start;
-    if ( end > 0x20000 )
+    end = 0x20000;
-    {
+  }
-        len = 0x1ffff - start;
+  uint32_t crc = 0xffffffff;
-        end = 0x20000;
+  uint32_t s = start;
-    }
+  while(s < end) {
-
+    crc = crc32_update(crc, *(const unsigned char*)(s));
-    uint32_t crc = 0xffffffff;
+    s++;
-    uint32_t s = start;
+  }
-
+  crc = crc_finalize(crc);
-    while ( s < end )
+  DBG_BL printf("  crc generated. result=%08lx\n", crc);
-    {
+  DBG_BL printf("} //calc_flash_crc\n");
-        crc = crc32_update( crc, *( const unsigned char * )( s ) );
+  return crc;
-        s++;
-    }
-
-    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()
+void test_iap() {
-{
+  iap_cmd[0]=54;
-    iap_cmd[0] = 54;
+  iap_entry(iap_cmd, iap_res);
-    iap_entry( iap_cmd, iap_res );
+  DBG_BL printf("Part ID=%08lx\n", iap_res[1]);
-    DBG_BL printf( "Part ID=%08lx\n", iap_res[1] );
 }
 
-void print_header( sd2snes_fw_header *header )
+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",
-    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->magic, header->version, header->size,
+         header->crc, header->crcc);
-                   header->crc, header->crcc );
 }
 
-int check_header( sd2snes_fw_header *header, uint32_t crc )
+int check_header(sd2snes_fw_header *header, uint32_t crc) {
-{
+  if((header->magic != FW_MAGIC)
-    if ( ( header->magic != FW_MAGIC )
+     || (header->size < 0x200)
-            || ( header->size < 0x200 )
+     || (header->size > (0x1ffff - FW_START))
-            || ( header->size > ( 0x1ffff - FW_START ) )
+     || ((header->crc ^ header->crcc) != 0xffffffff)) {
-            || ( ( header->crc ^ header->crcc ) != 0xffffffff ) )
+    return ERR_FLASHHD;
-    {
+  }
-        return ERR_FLASHHD;
+  if(header->crc != crc) {
-    }
+    return ERR_FLASHCRC;
-
+  }
-    if ( header->crc != crc )
+  return ERR_OK;
-    {
-        return ERR_FLASHCRC;
-    }
-
-    return ERR_OK;
 }
 
-FLASH_RES check_flash()
+FLASH_RES check_flash() {
-{
+  sd2snes_fw_header *fw_header = (sd2snes_fw_header*) FW_START;
-    sd2snes_fw_header *fw_header = ( sd2snes_fw_header * ) FW_START;
+  uint32_t flash_addr = 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 )
+    return ERR_HW;
-    {
+  }
-        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",
+  DBG_BL printf("Current flash contents:\n");
-                       FW_START, flash_addr );
+  DBG_BL print_header(fw_header);
-        return ERR_HW;
+  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 )
+IAP_RES iap_wrap(uint32_t *iap_cmd, uint32_t *iap_res) {
-{
+//  NVIC_DisableIRQ(RIT_IRQn);
-    //  NVIC_DisableIRQ(RIT_IRQn);
+//  NVIC_DisableIRQ(UART_IRQ);
-    //  NVIC_DisableIRQ(UART_IRQ);
+  for(volatile int i=0; i<2048; i++);
-    for ( volatile int i = 0; i < 2048; i++ );
+  iap_entry(iap_cmd, iap_res);
-
+  for(volatile int i=0; i<2048; i++);
-    iap_entry( iap_cmd, iap_res );
+//  NVIC_EnableIRQ(UART_IRQ);
-
+  return iap_res[0];
-    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 )
+IAP_RES iap_prepare_for_write(uint32_t start, uint32_t end) {
-{
+  if(start < (FW_START / 0x1000)) return INVALID_SECTOR;
-    if ( start < ( FW_START / 0x1000 ) )
+  iap_cmd[0] = 50;
-    {
+  iap_cmd[1] = start;
-        return INVALID_SECTOR;
+  iap_cmd[2] = end;
-    }
+  iap_wrap(iap_cmd, iap_res);
-
+  return iap_res[0];
-    iap_cmd[0] = 50;
-    iap_cmd[1] = start;
-    iap_cmd[2] = end;
-    iap_wrap( iap_cmd, iap_res );
-    return iap_res[0];
 }
 
-IAP_RES iap_erase( uint32_t start, uint32_t end )
+IAP_RES iap_erase(uint32_t start, uint32_t end) {
-{
+  if(start < (FW_START / 0x1000)) return INVALID_SECTOR;
-    if ( start < ( FW_START / 0x1000 ) )
+  iap_cmd[0] = 52;
-    {
+  iap_cmd[1] = start;
-        return INVALID_SECTOR;
+  iap_cmd[2] = end;
-    }
+  iap_cmd[3] = CONFIG_CPU_FREQUENCY / 1000L;
-
+  iap_wrap(iap_cmd, iap_res);
-    iap_cmd[0] = 52;
+  return iap_res[0];
-    iap_cmd[1] = start;
-    iap_cmd[2] = end;
-    iap_cmd[3] = CONFIG_CPU_FREQUENCY / 1000L;
-    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[0] = 51;
+  iap_cmd[1] = tgt;
-    iap_cmd[1] = tgt;
+  iap_cmd[2] = (uint32_t)src;
-    iap_cmd[2] = ( uint32_t )src;
+  iap_cmd[3] = num;
-    iap_cmd[3] = num;
+  iap_cmd[4] = CONFIG_CPU_FREQUENCY / 1000L;
-    iap_cmd[4] = CONFIG_CPU_FREQUENCY / 1000L;
+  iap_wrap(iap_cmd, iap_res);
-    iap_wrap( iap_cmd, iap_res );
+  return iap_res[0];
-    return iap_res[0];
 }
 
-FLASH_RES flash_file( uint8_t *filename )
+FLASH_RES flash_file(uint8_t *filename) {
-{
+  sd2snes_fw_header *fw_header = (sd2snes_fw_header*) FW_START;
-    sd2snes_fw_header *fw_header = ( sd2snes_fw_header * ) FW_START;
+  uint32_t flash_addr = FW_START;
-    uint32_t flash_addr = FW_START;
+  uint32_t file_crc = 0xffffffff;
-    uint32_t file_crc = 0xffffffff;
+  uint16_t count;
-    uint16_t count;
+  sd2snes_fw_header file_header;
-    sd2snes_fw_header file_header;
+  UINT bytes_read;
-    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 )
+    return ERR_HW;
-    {
+  }
-        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",
+  file_open(filename, FA_READ);
-                       FW_START, flash_addr );
+  if(file_res) {
-        return ERR_HW;
+    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(;;) {
+      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]);
+      }
+    }
+    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");
+      return ERR_FILECHK;
     }
 
-    file_open( filename, FA_READ );
+    uint32_t res;
 
-    if ( file_res )
+    writeled(1);
-    {
+    DBG_BL printf("erasing flash...\n");
-        DBG_BL printf( "file_open: error %d\n", file_res );
+    DBG_UART uart_putc('P');
-        return ERR_FS;
+    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');
+      return ERR_FLASHERASE;
     }
-
+    DBG_BL printf("writing... @%08lx\n", flash_addr);
-    DBG_BL printf( "firmware image found. file size: %ld\n", file_handle.fsize );
+    file_close();
-    DBG_BL printf( "reading header...\n" );
+    file_open(filename, FA_READ);
-    f_read( &file_handle, &file_header, 32, &bytes_read );
+    uint8_t current_sec;
-    DBG_BL print_header( &file_header );
+    uint32_t total_read = 0;
-
+    for(flash_addr = FW_START; flash_addr < 0x00020000; flash_addr += 0x200) {
-    if ( check_flash() || file_header.version != fw_header->version || file_header.version == FW_MAGIC
+      total_read += (bytes_read = file_read());
-            || fw_header->version == FW_MAGIC )
+      if(file_res || !bytes_read) break;
-    {
+      current_sec = flash_addr & 0x10000 ? (16 + ((flash_addr >> 15) & 1))
-        DBG_UART uart_putc( 'F' );
+                                         : (flash_addr >> 12);
-        f_read( &file_handle, file_buf, 0xe0, &bytes_read );
+      DBG_BL printf("current_sec=%d flash_addr=%08lx\n", current_sec, flash_addr);
-
+      DBG_UART uart_putc('.');
-        for ( ;; )
+      if(current_sec < (FW_START / 0x1000)) return ERR_FLASH;
-        {
+      DBG_UART uart_putc(current_sec["0123456789ABCDEFGH"]);
-            bytes_read = file_read();
+      DBG_UART uart_putc('p');
-
+      if((res = iap_prepare_for_write(current_sec, current_sec)) != CMD_SUCCESS) {
-            if ( file_res || !bytes_read )
+        DBG_BL printf("error %ld while preparing sector %d for write\n", res, current_sec);
-            {
+        DBG_UART uart_putc('X');
-                break;
+        return ERR_FLASH;
-            }
+      }
-
+      DBG_UART uart_putc('w');
-            for ( count = 0; count < bytes_read; count++ )
+      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);
-                file_crc = crc32_update( file_crc, file_buf[count] );
+        DBG_UART uart_putc('X');
-            }
+        return ERR_FLASH;
-        }
+      }
-
-        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" );
-            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' );
-            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' );
-            return ERR_FLASHERASE;
-        }
-
-        DBG_BL printf( "writing... @%08lx\n", flash_addr );
-        file_close();
-        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' );
-                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');
-            return ERR_FILECHK;
-        }
-
-        writeled( 0 );
     }
-    else
+    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( 'n' );
+//      DBG_UART uart_putc('X');
-        DBG_BL printf( "flash content is ok, no version mismatch, no forced upgrade. No need to flash\n" );
+      return ERR_FILECHK;
     }
-
+    writeled(0);
-    return ERR_OK;
+  } 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,41 +2,39 @@
 #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
+typedef enum {
-{
+/* 0*/  CMD_SUCCESS = 0,
-    /* 0*/  CMD_SUCCESS = 0,
+/* 1*/  INVALID_COMMAND,
-    /* 1*/  INVALID_COMMAND,
+/* 2*/  SRC_ADDR_ERROR,
-    /* 2*/  SRC_ADDR_ERROR,
+/* 3*/  DST_ADDR_ERROR,
-    /* 3*/  DST_ADDR_ERROR,
+/* 4*/  SRC_ADDR_NOT_MAPPED,
-    /* 4*/  SRC_ADDR_NOT_MAPPED,
+/* 5*/  DST_ADDR_NOT_MAPPED,
-    /* 5*/  DST_ADDR_NOT_MAPPED,
+/* 6*/  COUNT_ERROR,
-    /* 6*/  COUNT_ERROR,
+/* 7*/  INVALID_SECTOR,
-    /* 7*/  INVALID_SECTOR,
+/* 8*/  SECTOR_NOT_BLANK,
-    /* 8*/  SECTOR_NOT_BLANK,
+/* 9*/  SECTOR_NOT_PREPARED_FOR_WRITE_OPERATION,
-    /* 9*/  SECTOR_NOT_PREPARED_FOR_WRITE_OPERATION,
+/*10*/  COMPARE_ERROR,
-    /*10*/  COMPARE_ERROR,
+/*11*/  BUSY
-    /*11*/  BUSY
 } IAP_RES;
 
 #define FW_MAGIC     (0x44534E53)
 
-typedef struct
+typedef struct {
-{
+  uint32_t magic;
-    uint32_t magic;
+  uint32_t version;
-    uint32_t version;
+  uint32_t size;
-    uint32_t size;
+  uint32_t crc;
-    uint32_t crc;
+  uint32_t crcc;
-    uint32_t crcc;
 } sd2snes_fw_header;
 
-uint32_t calc_flash_crc( uint32_t start, uint32_t end );
+uint32_t calc_flash_crc(uint32_t start, uint32_t end);
-void test_iap( void );
+void test_iap(void);
-FLASH_RES check_flash( void );
+FLASH_RES check_flash(void);
-FLASH_RES flash_file( uint8_t *filename );
+FLASH_RES flash_file(uint8_t* filename);
 
 
 #endif

src/bootldr/integer.h

@@ -5,7 +5,7 @@
 #ifndef _INTEGER
 #define _INTEGER
 
-#ifdef _WIN32   /* FatFs development platform */
+#ifdef _WIN32	/* FatFs development platform */
 
 #include <windows.h>
 #include <tchar.h>

src/bootldr/led.c

@@ -18,85 +18,73 @@ int led_writeledstate = 0;
    write  red    P1.23 PWM1[4]
 */
 
-void rdyled( unsigned int state )
+void rdyled(unsigned int state) {
-{
+  BITBAND(LPC_GPIO2->FIODIR, 4) = state;
-    BITBANG( LPC_GPIO2->FIODIR, 4 ) = state;
+  led_rdyledstate = state;
-    led_rdyledstate = state;
 }
 
-void readled( unsigned int state )
+void readled(unsigned int state) {
-{
+  BITBAND(LPC_GPIO2->FIODIR, 5) = state;
-    BITBANG( LPC_GPIO2->FIODIR, 5 ) = state;
+  led_readledstate = state;
-    led_readledstate = state;
 }
 
-void writeled( unsigned int state )
+void writeled(unsigned int state) {
-{
+  BITBAND(LPC_GPIO1->FIODIR, 23) = state;
-    BITBANG( LPC_GPIO1->FIODIR, 23 ) = state;
+  led_writeledstate = state;
-    led_writeledstate = state;
 }
 
-void led_clkout32( uint32_t val )
+void led_clkout32(uint32_t val) {
-{
+  while(1) {
-    while ( 1 )
+    rdyled(1);
-    {
+    delay_ms(400);
-        rdyled( 1 );
+    readled((val & BV(31))>>31);
-        delay_ms( 400 );
+    rdyled(0);
-        readled( ( val & BV( 31 ) ) >> 31 );
+    val<<=1;
-        rdyled( 0 );
+    delay_ms(400);
-        val <<= 1;
+  }
-        delay_ms( 400 );
-    }
 }
 
-void toggle_rdy_led()
+void toggle_rdy_led() {
-{
+  rdyled(~led_rdyledstate);
-    rdyled( ~led_rdyledstate );
 }
 
-void toggle_read_led()
+void toggle_read_led() {
-{
+  readled(~led_readledstate);
-    readled( ~led_readledstate );
 }
 
-void toggle_write_led()
+void toggle_write_led() {
-{
+  writeled(~led_writeledstate);
-    writeled( ~led_writeledstate );
 }
 
-void led_panic()
+void led_panic() {
-{
+  while(1) {
-    while ( 1 )
+    LPC_GPIO2->FIODIR |= BV(4) | BV(5);
-    {
+    LPC_GPIO1->FIODIR |= BV(23);
-        LPC_GPIO2->FIODIR |= BV( 4 ) | BV( 5 );
+    delay_ms(350);
-        LPC_GPIO1->FIODIR |= BV( 23 );
+    LPC_GPIO2->FIODIR &= ~(BV(4) | BV(5));
-        delay_ms( 350 );
+    LPC_GPIO1->FIODIR &= ~BV(23);
-        LPC_GPIO2->FIODIR &= ~( BV( 4 ) | BV( 5 ) );
+    delay_ms(350);
-        LPC_GPIO1->FIODIR &= ~BV( 23 );
+  }
-        delay_ms( 350 );
-    }
 }
 
-void led_std()
+void led_std() {
-{
+  BITBAND(LPC_PINCON->PINSEL4, 9) = 0;
-    BITBANG( LPC_PINCON->PINSEL4, 9 ) = 0;
+  BITBAND(LPC_PINCON->PINSEL4, 8) = 0;
-    BITBANG( LPC_PINCON->PINSEL4, 8 ) = 0;
 
-    BITBANG( LPC_PINCON->PINSEL4, 11 ) = 0;
+  BITBAND(LPC_PINCON->PINSEL4, 11) = 0;
-    BITBANG( LPC_PINCON->PINSEL4, 10 ) = 0;
+  BITBAND(LPC_PINCON->PINSEL4, 10) = 0;
 
-    BITBANG( LPC_PINCON->PINSEL3, 15 ) = 0;
+  BITBAND(LPC_PINCON->PINSEL3, 15) = 0;
-    BITBANG( LPC_PINCON->PINSEL3, 14 ) = 0;
+  BITBAND(LPC_PINCON->PINSEL3, 14) = 0;
 
-    BITBANG( LPC_PWM1->PCR, 12 ) = 0;
+  BITBAND(LPC_PWM1->PCR, 12) = 0;
-    BITBANG( LPC_PWM1->PCR, 13 ) = 0;
+  BITBAND(LPC_PWM1->PCR, 13) = 0;
-    BITBANG( LPC_PWM1->PCR, 14 ) = 0;
+  BITBAND(LPC_PWM1->PCR, 14) = 0;
 }
 
-void led_init()
+void led_init() {
-{
+/* power is already connected by default */
-    /* power is already connected by default */
+/* set PCLK divider to 8 */
-    /* set PCLK divider to 8 */
+  BITBAND(LPC_SC->PCLKSEL1, 21) = 1;
-    BITBANG( LPC_SC->PCLKSEL1, 21 ) = 1;
+  BITBAND(LPC_SC->PCLKSEL1, 20) = 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 readled(unsigned int state);
-void writeled( unsigned int state );
+void writeled(unsigned int state);
-void rdyled( unsigned int state );
+void rdyled(unsigned int state);
-void led_clkout32( uint32_t val );
+void led_clkout32(uint32_t val);
-void toggle_rdy_led( void );
+void toggle_rdy_led(void);
-void toggle_read_led( void );
+void toggle_read_led(void);
-void toggle_write_led( void );
+void toggle_write_led(void);
-void led_panic( void );
+void led_panic(void);
-void led_std( void );
+void led_std(void);
-void led_init( 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
+#adapter_nsrst_delay 200
-#jtag_nsrst_delay 200
+jtag_nsrst_delay 200
-#jtag_ntrst_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.
-adapter_khz 1000
+jtag_khz 1000
 
 $_TARGETNAME configure -event reset-init {
 	# Do not remap 0x0000-0x0020 to anything but the flash (i.e. select

src/bootldr/main.c

@@ -15,118 +15,88 @@
 #include "fileops.h"
 #include "iap.h"
 
-#define EMC0TOGGLE  (3<<4)
+#define EMC0TOGGLE	(3<<4)
-#define MR0R        (1<<1)
+#define MR0R		(1<<1)
 
 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 )
+int main(void) {
-{
+  SNES_CIC_PAIR_REG->FIODIR = BV(SNES_CIC_PAIR_BIT);
-    SNES_CIC_PAIR_REG->FIODIR = BV( SNES_CIC_PAIR_BIT );
+  BITBAND(SNES_CIC_PAIR_REG->FIOSET, SNES_CIC_PAIR_BIT) = 1;
-    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);
 
-    /*  LPC_GPIO2->FIODIR = BV(0) | BV(1) | BV(2); */
+ /* connect UART3 on P0[25:26] + SSP0 on P0[15:18] + MAT3.0 on P0[10] */
-    //  LPC_GPIO0->FIODIR = BV(16);
+  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) */
 
-    /* connect UART3 on P0[25:26] + SSP0 on P0[15:18] + MAT3.0 on P0[10] */
+ /* pull-down CIC data lines */
-    LPC_PINCON->PINSEL1 = BV( 18 ) | BV( 19 ) | BV( 20 ) | BV( 21 ) /* UART3 */
+  LPC_PINCON->PINMODE0 = BV(0) | BV(1) | BV(2) | BV(3);
-                          | 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 */
+  clock_disconnect();
-    LPC_PINCON->PINMODE0 = BV( 0 ) | BV( 1 ) | BV( 2 ) | BV( 3 );
+  power_init();
-
+  timer_init();
-    clock_disconnect();
+  DBG_UART uart_init();
-    power_init();
+  led_init();
-    timer_init();
+  readled(0);
-    DBG_UART uart_init();
+  rdyled(1);
-    led_init();
+  writeled(0);
-    readled( 0 );
+ /* do this last because the peripheral init()s change PCLK dividers */
-    rdyled( 1 );
+  clock_init();
-    writeled( 0 );
+//  LPC_PINCON->PINSEL0 |= BV(20) | BV(21);                  /* MAT3.0 (FPGA clock) */
-    /* do this last because the peripheral init()s change PCLK dividers */
+  sdn_init();
-    clock_init();
+  DBG_BL printf("chksum=%08lx\n", *(uint32_t*)28);
-    //  LPC_PINCON->PINSEL0 |= BV(20) | BV(21);                  /* MAT3.0 (FPGA clock) */
+  DBG_BL printf("\n\nsd2snes mk.2 bootloader\nver.: " VER "\ncpu clock: %ld Hz\n", CONFIG_CPU_FREQUENCY);
-    sdn_init();
+DBG_BL printf("PCONP=%lx\n", LPC_SC->PCONP);
-
+/* setup timer (fpga clk) */
-    for ( i = 0; i < 20; i++ )
+  LPC_TIM3->CTCR=0;
-    {
+  LPC_TIM3->EMR=EMC0TOGGLE;
-        uart_putc( '-' );
+  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);
 
-    uart_putc( '\n' );
+  SCB->VTOR=FW_START+0x00000100;
-
+  chain = (void*)(*((uint32_t*)(FW_START+0x00000104)));
-    DBG_BL printf( "chksum=%08lx\n", *( uint32_t * )28 );
+  uart_putc("0123456789abcdef"[((uint32_t)chain>>28)&15]);
-    /*DBG_BL*/ printf( "\n\nsd2snes mk.2 bootloader\nver.: " VER "\ncpu clock: %ld Hz\n", CONFIG_CPU_FREQUENCY );
+  uart_putc("0123456789abcdef"[((uint32_t)chain>>24)&15]);
-    DBG_BL printf( "PCONP=%lx\n", LPC_SC->PCONP );
+  uart_putc("0123456789abcdef"[((uint32_t)chain>>20)&15]);
-    /* setup timer (fpga clk) */
+  uart_putc("0123456789abcdef"[((uint32_t)chain>>16)&15]);
-    LPC_TIM3->CTCR = 0;
+  uart_putc("0123456789abcdef"[((uint32_t)chain>>12)&15]);
-    LPC_TIM3->EMR = EMC0TOGGLE;
+  uart_putc("0123456789abcdef"[((uint32_t)chain>>8)&15]);
-    LPC_TIM3->MCR = MR0R;
+  uart_putc("0123456789abcdef"[((uint32_t)chain>>4)&15]);
-    LPC_TIM3->MR0 = 1;
+  uart_putc("0123456789abcdef"[((uint32_t)chain)&15]);
-    LPC_TIM3->TCR = 1;
+  uart_putc('\n');
-    NVIC->ICER[0] = 0xffffffff;
+  chain();
-    NVIC->ICER[1] = 0xffffffff;
+  while(1);
-    FLASH_RES res = flash_file( ( uint8_t * )"/sd2snes/firmware.img" );
-
-    if ( res == ERR_FLASHPREP || res == ERR_FLASHERASE || res == ERR_FLASH )
-    {
-        rdyled( 0 );
-        writeled( 1 );
-    }
-
-    if ( res == ERR_FILEHD || res == ERR_FILECHK )
-    {
-        rdyled( 0 );
-        readled( 1 );
-    }
-
-    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 );
 }
 

src/bootldr/power.c

@@ -15,13 +15,12 @@
    * USB [enabled via usb_init]
    * PWM1
 */
-void power_init()
+void power_init() {
-{
+  LPC_SC->PCONP = BV(PCSSP0)
-    LPC_SC->PCONP = BV( PCSSP0 )
+                | BV(PCTIM3)
-                    | BV( PCTIM3 )
+                | BV(PCRTC)
-                    | BV( PCRTC )
+                | BV(PCGPIO)
-                    | BV( PCGPIO )
+                | BV(PCPWM1)
-                    | BV( PCPWM1 )
+//                 | BV(PCUSB)
-                    //                 | BV(PCUSB)
+  ;
-                    ;
 }

src/bootldr/power.h

@@ -5,7 +5,7 @@
 
 #include "bits.h"
 
-#define PCUART0 (3)
+#define PCUART0	(3)
 #define PCUART1 (4)
 #define PCUART2 (24)
 #define PCUART3 (25)
@@ -38,6 +38,6 @@
 #define PCQEI   (18)
 #define PCGPIO  (15)
 
-void power_init( void );
+void power_init(void);
 
 #endif

src/bootldr/printf.c

@@ -62,313 +62,239 @@ static char *outptr;
 static int maxlen;
 
 /* printf */
-static void outchar( char x )
+static void outchar(char x) {
-{
+  if (maxlen) {
-    if ( maxlen )
+    maxlen--;
-    {
+    outfunc(x);
-        maxlen--;
+    outlength++;
-        outfunc( x );
+  }
-        outlength++;
-    }
 }
 
 /* sprintf */
-static void outstr( char x )
+static void outstr(char x) {
-{
+  if (maxlen) {
-    if ( maxlen )
+    maxlen--;
-    {
+    *outptr++ = x;
-        maxlen--;
+    outlength++;
-        *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 width;
+  unsigned int flags;
-    unsigned int flags;
+  unsigned int base = 0;
-    unsigned int base = 0;
+  char *ptr = NULL;
-    char *ptr = NULL;
 
-    outlength = 0;
+  outlength = 0;
 
-    while ( *fmt )
+  while (*fmt) {
-    {
+    while (1) {
-        while ( 1 )
+      if (*fmt == 0)
-        {
+        goto end;
-            if ( *fmt == 0 )
-            {
-                goto end;
-            }
-
-            if ( *fmt == '%' )
-            {
-                fmt++;
-
-                if ( *fmt != '%' )
-                {
-                    break;
-                }
-            }
-
-            output_function( *fmt++ );
-        }
-
-        flags = 0;
-        width = 0;
-
-        /* read all flags */
-        do
-        {
-            if ( flags < FLAG_WIDTH )
-            {
-                switch ( *fmt )
-                {
-                case '0':
-                    flags |= FLAG_ZEROPAD;
-                    continue;
-
-                case '-':
-                    flags |= FLAG_LEFTADJ;
-                    continue;
-
-                case ' ':
-                    flags |= FLAG_BLANK;
-                    continue;
-
-                case '+':
-                    flags |= FLAG_FORCESIGN;
-                    continue;
-                }
-            }
-
-            if ( flags < FLAG_LONG )
-            {
-                if ( *fmt >= '0' && *fmt <= '9' )
-                {
-                    unsigned char tmp = *fmt - '0';
-                    width = 10 * width + tmp;
-                    flags |= FLAG_WIDTH;
-                    continue;
-                }
-
-                if ( *fmt == 'h' )
-                {
-                    continue;
-                }
-
-                if ( *fmt == 'l' )
-                {
-                    flags |= FLAG_LONG;
-                    continue;
-                }
-            }
-
-            break;
-        }
-        while ( *fmt++ );
-
-        /* Strings */
-        if ( *fmt == 'c' || *fmt == 's' )
-        {
-            switch ( *fmt )
-            {
-            case 'c':
-                buffer[0] = va_arg( ap, int );
-                ptr = buffer;
-                break;
-
-            case 's':
-                ptr = va_arg( ap, char * );
-                break;
-            }
-
-            goto output;
-        }
-
-        /* Numbers */
-        switch ( *fmt )
-        {
-        case 'u':
-            flags |= FLAG_UNSIGNED;
-
-        case 'd':
-            base = 10;
-            break;
-
-        case 'o':
-            base = 8;
-            flags |= FLAG_UNSIGNED;
-            break;
-
-        case 'p': // pointer
-            output_function( '0' );
-            output_function( 'x' );
-            width -= 2;
-
-        case 'x':
-        case 'X':
-            base = 16;
-            flags |= FLAG_UNSIGNED;
-            break;
-        }
-
-        unsigned int num;
-
-        if ( !( flags & FLAG_UNSIGNED ) )
-        {
-            int tmp = va_arg( ap, int );
-
-            if ( tmp < 0 )
-            {
-                num = -tmp;
-                flags |= FLAG_NEGATIVE;
-            }
-            else
-            {
-                num = tmp;
-            }
-        }
-        else
-        {
-            num = va_arg( ap, unsigned int );
-        }
-
-        /* Convert number into buffer */
-        ptr = buffer + sizeof( buffer );
-        *--ptr = 0;
-
-        do
-        {
-            *--ptr = hexdigits[num % base];
-            num /= base;
-        }
-        while ( num != 0 );
-
-        /* Sign */
-        if ( flags & FLAG_NEGATIVE )
-        {
-            output_function( '-' );
-            width--;
-        }
-        else if ( flags & FLAG_FORCESIGN )
-        {
-            output_function( '+' );
-            width--;
-        }
-        else if ( flags & FLAG_BLANK )
-        {
-            output_function( ' ' );
-            width--;
-        }
-
-output:
-
-        /* left padding */
-        if ( ( flags & FLAG_WIDTH ) && !( flags & FLAG_LEFTADJ ) )
-        {
-            while ( strlen( ptr ) < width )
-            {
-                if ( flags & FLAG_ZEROPAD )
-                {
-                    output_function( '0' );
-                }
-                else
-                {
-                    output_function( ' ' );
-                }
-
-                width--;
-            }
-        }
-
-        /* data */
-        while ( *ptr )
-        {
-            output_function( *ptr++ );
-
-            if ( width )
-            {
-                width--;
-            }
-        }
-
-        /* right padding */
-        if ( flags & FLAG_WIDTH )
-        {
-            while ( width )
-            {
-                output_function( ' ' );
-                width--;
-            }
-        }
 
+      if (*fmt == '%') {
         fmt++;
+        if (*fmt != '%')
+          break;
+      }
+
+      output_function(*fmt++);
     }
 
-end:
+    flags = 0;
-    return outlength;
+    width = 0;
-}
 
-int printf( const char *format, ... )
+    /* read all flags */
-{
+    do {
-    va_list ap;
+      if (flags < FLAG_WIDTH) {
-    int res;
+        switch (*fmt) {
+        case '0':
+          flags |= FLAG_ZEROPAD;
+          continue;
 
-    maxlen = -1;
+        case '-':
-    va_start( ap, format );
+          flags |= FLAG_LEFTADJ;
-    res = internal_nprintf( outchar, format, ap );
+          continue;
-    va_end( ap );
-    return res;
-}
 
-int snprintf( char *str, size_t size, const char *format, ... )
+        case ' ':
-{
+          flags |= FLAG_BLANK;
-    va_list ap;
+          continue;
-    int res;
 
-    maxlen = size;
+        case '+':
-    outptr = str;
+          flags |= FLAG_FORCESIGN;
-    va_start( ap, format );
+          continue;
-    res = internal_nprintf( outstr, format, ap );
+        }
-    va_end( ap );
+      }
 
-    if ( res < size )
+      if (flags < FLAG_LONG) {
-    {
+        if (*fmt >= '0' && *fmt <= '9') {
-        str[res] = 0;
+          unsigned char tmp = *fmt - '0';
+          width = 10*width + tmp;
+          flags |= FLAG_WIDTH;
+          continue;
+        }
+
+        if (*fmt == 'h')
+          continue;
+
+        if (*fmt == 'l') {
+          flags |= FLAG_LONG;
+          continue;
+        }
+      }
+
+      break;
+    } while (*fmt++);
+
+    /* Strings */
+    if (*fmt == 'c' || *fmt == 's') {
+      switch (*fmt) {
+      case 'c':
+        buffer[0] = va_arg(ap, int);
+        ptr = buffer;
+        break;
+
+      case 's':
+        ptr = va_arg(ap, char *);
+        break;
+      }
+
+      goto output;
     }
 
-    return res;
+    /* Numbers */
+    switch (*fmt) {
+    case 'u':
+      flags |= FLAG_UNSIGNED;
+    case 'd':
+      base = 10;
+      break;
+
+    case 'o':
+      base = 8;
+      flags |= FLAG_UNSIGNED;
+      break;
+
+    case 'p': // pointer
+      output_function('0');
+      output_function('x');
+      width -= 2;
+    case 'x':
+    case 'X':
+      base = 16;
+      flags |= FLAG_UNSIGNED;
+      break;
+    }
+
+    unsigned int num;
+
+    if (!(flags & FLAG_UNSIGNED)) {
+      int tmp = va_arg(ap, int);
+      if (tmp < 0) {
+        num = -tmp;
+        flags |= FLAG_NEGATIVE;
+      } else
+        num = tmp;
+    } else {
+      num = va_arg(ap, unsigned int);
+    }
+
+    /* Convert number into buffer */
+    ptr = buffer + sizeof(buffer);
+    *--ptr = 0;
+    do {
+      *--ptr = hexdigits[num % base];
+      num /= base;
+    } while (num != 0);
+
+    /* Sign */
+    if (flags & FLAG_NEGATIVE) {
+      output_function('-');
+      width--;
+    } else if (flags & FLAG_FORCESIGN) {
+      output_function('+');
+      width--;
+    } else if (flags & FLAG_BLANK) {
+      output_function(' ');
+      width--;
+    }
+
+  output:
+    /* left padding */
+    if ((flags & FLAG_WIDTH) && !(flags & FLAG_LEFTADJ)) {
+      while (strlen(ptr) < width) {
+        if (flags & FLAG_ZEROPAD)
+          output_function('0');
+        else
+          output_function(' ');
+        width--;
+      }
+    }
+
+    /* data */
+    while (*ptr) {
+      output_function(*ptr++);
+      if (width)
+        width--;
+    }
+
+    /* right padding */
+    if (flags & FLAG_WIDTH) {
+      while (width) {
+        output_function(' ');
+        width--;
+      }
+    }
+
+    fmt++;
+  }
+
+ end:
+  return outlength;
+}
+
+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);
+  return res;
+}
+
+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)
+    str[res] = 0;
+  return res;
 }
 
 /* Required for gcc compatibility */
-int puts( const char *str )
+int puts(const char *str) {
-{
+  uart_puts(str);
-    uart_puts( str );
+  uart_putc('\n');
-    uart_putc( '\n' );
+  return 0;
-    return 0;
 }
 
 #undef putchar
-int putchar( int c )
+int putchar(int c) {
-{
+  uart_putc(c);
-    uart_putc( c );
+  return 0;
-    return 0;
 }
 
 #else
-int printf( const char *format, ... )
+int printf(const char *format, ...) { return 0; }
-{
+int snprintf(char *str, size_t size, const char *format, ...) { return 0; }
-    return 0;
+int puts(const char *str) { 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 )
+int putchar(int c) { return 0; }
-{
-    return 0;
-}
 #endif

src/bootldr/timer.c

@@ -1,4 +1,5 @@
 /* ___INGO___ */
+
 #include <arm/NXP/LPC17xx/LPC17xx.h>
 #include "bits.h"
 #include "config.h"
@@ -17,44 +18,41 @@ 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 */
-    /* turn on power to RIT */
+  BITBAND(LPC_SC->PCONP, PCRIT) = 1;
-    BITBANG( LPC_SC->PCONP, PCRIT ) = 1;
 
-    /* clear RIT mask */
+  /* clear RIT mask */
-    LPC_RIT->RIMASK = 0; /*xffffffff;*/
+  LPC_RIT->RIMASK = 0; /*xffffffff;*/
 
-    /* PCLK = CCLK */
+  /* PCLK = CCLK */
-    BITBANG( LPC_SC->PCLKSEL1, 26 ) = 1;
+  BITBAND(LPC_SC->PCLKSEL1, 26) = 1;
-    BITBANG( LPC_SC->PCLKSEL1, PCLK_TIMER3 ) = 1;
+  BITBAND(LPC_SC->PCLKSEL1, PCLK_TIMER3) = 1;
 }
 
-void delay_us( unsigned int time )
+void delay_us(unsigned int time) {
-{
+  /* Prepare RIT */
-    /* Prepare RIT */
+  LPC_RIT->RICOUNTER = 0;
-    LPC_RIT->RICOUNTER = 0;
+  LPC_RIT->RICOMPVAL = (CONFIG_CPU_FREQUENCY / 1000000) * time;
-    LPC_RIT->RICOMPVAL = ( CONFIG_CPU_FREQUENCY / 1000000 ) * time;
+  LPC_RIT->RICTRL    = BV(RITEN) | BV(RITINT);
-    LPC_RIT->RICTRL    = BV( RITEN ) | BV( RITINT );
 
-    /* Wait until RIT signals an interrupt */
+  /* Wait until RIT signals an interrupt */
-    while ( !( BITBANG( LPC_RIT->RICTRL, RITINT ) ) ) ;
+  while (!(BITBAND(LPC_RIT->RICTRL, RITINT))) ;
 
-    /* Disable RIT */
+  /* Disable RIT */
-    LPC_RIT->RICTRL = 0;
+  LPC_RIT->RICTRL = 0;
 }
 
-void delay_ms( unsigned int time )
+void delay_ms(unsigned int time) {
-{
+  /* Prepare RIT */
-    /* Prepare RIT */
+  LPC_RIT->RICOUNTER = 0;
-    LPC_RIT->RICOUNTER = 0;
+  LPC_RIT->RICOMPVAL = (CONFIG_CPU_FREQUENCY / 1000) * time;
-    LPC_RIT->RICOMPVAL = ( CONFIG_CPU_FREQUENCY / 1000 ) * time;
+  LPC_RIT->RICTRL    = BV(RITEN) | BV(RITINT);
-    LPC_RIT->RICTRL    = BV( RITEN ) | BV( RITINT );
 
-    /* Wait until RIT signals an interrupt */
+  /* Wait until RIT signals an interrupt */
-    while ( !( BITBANG( LPC_RIT->RICTRL, RITINT ) ) ) ;
+  while (!(BITBAND(LPC_RIT->RICTRL, RITINT))) ;
 
-    /* Disable RIT */
+  /* Disable RIT */
-    LPC_RIT->RICTRL = 0;
+  LPC_RIT->RICTRL = 0;
 }
 

src/bootldr/timer.h

@@ -13,9 +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;
-    return ticks;
 }
 
 #define MS_TO_TICKS(x) (x/10)
@@ -36,17 +35,17 @@ static inline tick_t getticks( void )
  * (">=0" refers to the time_after_eq macro which wasn't copied)
  */
 #define time_after(a,b)         \
-    ((int)(b) - (int)(a) < 0)
+         ((int)(b) - (int)(a) < 0)
 #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 delay_ms(unsigned int time);
-void sleep_ms( unsigned int time );
+void sleep_ms(unsigned int time);
 
 #endif

src/bootldr/uart.c

@@ -75,179 +75,128 @@
 }
 */
 //static char txbuf[1 << CONFIG_UART_TX_BUF_SHIFT];
-static volatile unsigned int read_idx, write_idx;
+static volatile unsigned int read_idx,write_idx;
 
-void uart_putc( char c )
+void uart_putc(char c) {
-{
+  if (c == '\n')
-    if ( c == '\n' )
+    uart_putc('\r');
-    {
+  while(!(UART_REGS->LSR & (0x20)));
-        uart_putc( '\r' );
+  UART_REGS->THR = c;
-    }
-
-    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 */
-    /* wait for character */
+  while (!(BITBAND(UART_REGS->LSR, 0))) ;
-    while ( !( BITBANG( UART_REGS->LSR, 0 ) ) ) ;
+  return UART_REGS->RBR;
-
-    return UART_REGS->RBR;
 }
 
 /* Returns true if a char is ready */
-unsigned char uart_gotc( void )
+unsigned char uart_gotc(void) {
-{
+  return BITBAND(UART_REGS->LSR, 0);
-    return BITBANG( UART_REGS->LSR, 0 );
 }
 
-void uart_init( void )
+void uart_init(void) {
-{
+  uint32_t div;
-    uint32_t div;
 
-    /* Turn on power to UART */
+  /* Turn on power to UART */
-    BITBANG( LPC_SC->PCONP, UART_PCONBIT ) = 1;
+  BITBAND(LPC_SC->PCONP, UART_PCONBIT) = 1;
 
-    /* UART clock = CPU clock - this block is reduced at compile-time */
+  /* UART clock = CPU clock - this block is reduced at compile-time */
-    if ( CONFIG_UART_PCLKDIV == 1 )
+  if (CONFIG_UART_PCLKDIV == 1) {
-    {
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 1;
-        BITBANG( LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 1;
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT+1) = 0;
-        BITBANG( LPC_SC->UART_PCLKREG, UART_PCLKBIT + 1 ) = 0;
+  } else if (CONFIG_UART_PCLKDIV == 2) {
-    }
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 0;
-    else if ( CONFIG_UART_PCLKDIV == 2 )
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT+1) = 1;
-    {
+  } else if (CONFIG_UART_PCLKDIV == 4) {
-        BITBANG( LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 0;
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 0;
-        BITBANG( LPC_SC->UART_PCLKREG, UART_PCLKBIT + 1 ) = 1;
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT+1) = 0;
-    }
+  } else { // Fallback: Divide by 8
-    else if ( CONFIG_UART_PCLKDIV == 4 )
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT  ) = 1;
-    {
+    BITBAND(LPC_SC->UART_PCLKREG, UART_PCLKBIT+1) = 1;
-        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 */
+  /* set baud rate - no fractional stuff for now */
-    UART_REGS->LCR = BV( 7 ) | 3; // always 8n1
+  UART_REGS->LCR = BV(7) | 3; // always 8n1
-    div = 0xF80022; //0x850004; // baud2divisor(CONFIG_UART_BAUDRATE);
+  div = 0xF80022; //0x850004; // baud2divisor(CONFIG_UART_BAUDRATE);
 
-    UART_REGS->DLL = div & 0xff;
+  UART_REGS->DLL = div & 0xff;
-    UART_REGS->DLM = ( div >> 8 ) & 0xff;
+  UART_REGS->DLM = (div >> 8) & 0xff;
-    BITBANG( UART_REGS->LCR, 7 ) = 0;
+  BITBAND(UART_REGS->LCR, 7) = 0;
 
-    if ( div & 0xff0000 )
+  if (div & 0xff0000) {
-    {
+    UART_REGS->FDR = (div >> 16) & 0xff;
-        UART_REGS->FDR = ( div >> 16 ) & 0xff;
+  }
-    }
 
-    /* reset and enable FIFO */
+  /* reset and enable FIFO */
-    UART_REGS->FCR = BV( 0 );
+  UART_REGS->FCR = BV(0);
 
-    UART_REGS->THR = '?';
+  UART_REGS->THR = '?';
 }
 
 /* --- generic code below --- */
-void uart_puthex( uint8_t num )
+void uart_puthex(uint8_t num) {
-{
+  uint8_t tmp;
-    uint8_t tmp;
+  tmp = (num & 0xf0) >> 4;
-    tmp = ( num & 0xf0 ) >> 4;
+  if (tmp < 10)
+    uart_putc('0'+tmp);
+  else
+    uart_putc('a'+tmp-10);
 
-    if ( tmp < 10 )
+  tmp = num & 0x0f;
-    {
+  if (tmp < 10)
-        uart_putc( '0' + tmp );
+    uart_putc('0'+tmp);
-    }
+  else
-    else
+    uart_putc('a'+tmp-10);
-    {
-        uart_putc( 'a' + tmp - 10 );
-    }
-
-    tmp = num & 0x0f;
-
-    if ( tmp < 10 )
-    {
-        uart_putc( '0' + tmp );
-    }
-    else
-    {
-        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;
-    uint16_t i;
+  uint8_t j;
-    uint8_t j;
+  uint8_t ch;
-    uint8_t ch;
+  uint8_t *data = ptr;
-    uint8_t *data = ptr;
 
-    data += start;
+  data+=start;
+  for(i=0;i<len;i+=16) {
 
-    for ( i = 0; i < len; i += 16 )
+    uart_puthex(start>>8);
-    {
+    uart_puthex(start&0xff);
-
+    uart_putc('|');
-        uart_puthex( start >> 8 );
+    uart_putc(' ');
-        uart_puthex( start & 0xff );
+    for(j=0;j<16;j++) {
-        uart_putc( '|' );
+      if(i+j<len) {
-        uart_putc( ' ' );
+        ch=*(data + j);
-
+        uart_puthex(ch);
-        for ( j = 0; j < 16; j++ )
+      } else {
-        {
+        uart_putc(' ');
-            if ( i + j < len )
+        uart_putc(' ');
-            {
+      }
-                ch = *( data + j );
+      uart_putc(' ');
-                uart_puthex( ch );
-            }
-            else
-            {
-                uart_putc( ' ' );
-                uart_putc( ' ' );
-            }
-
-            uart_putc( ' ' );
-        }
-
-        uart_putc( '|' );
-
-        for ( j = 0; j < 16; j++ )
-        {
-            if ( i + j < len )
-            {
-                ch = *( data++ );
-
-                if ( ch < 32 || ch > 0x7e )
-                {
-                    ch = '.';
-                }
-
-                uart_putc( ch );
-            }
-            else
-            {
-                uart_putc( ' ' );
-            }
-        }
-
-        uart_putc( '|' );
-        uart_putcrlf();
-        start += 16;
     }
-}
+    uart_putc('|');
-
+    for(j=0;j<16;j++) {
-void uart_flush( void )
+      if(i+j<len) {
-{
+        ch=*(data++);
-    while ( read_idx != write_idx ) ;
+        if(ch<32 || ch>0x7e)
-}
+          ch='.';
-
+        uart_putc(ch);
-void uart_puts( const char *text )
+      } else {
-{
+        uart_putc(' ');
-    while ( *text )
+      }
-    {
-        uart_putc( *text++ );
     }
+    uart_putc('|');
+    uart_putcrlf();
+    start+=16;
+  }
+}
+
+void uart_flush(void) {
+  while (read_idx != write_idx) ;
+}
+
+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 );
+void uart_init(void);
-unsigned char uart_getc( void );
+unsigned char uart_getc(void);
-unsigned char uart_gotc( void );
+unsigned char uart_gotc(void);
-void uart_putc( char c );
+void uart_putc(char c);
-void uart_puts( const char *str );
+void uart_puts(const char *str);
-void uart_puthex( uint8_t num );
+void uart_puthex(uint8_t num);
-void uart_trace( void *ptr, uint16_t start, uint16_t len );
+void uart_trace(void *ptr, uint16_t start, uint16_t len);
-void uart_flush( void );
+void uart_flush(void);
-int  printf( const char *fmt, ... );
+int  printf(const char *fmt, ...);
-int  snprintf( char *str, size_t size, const char *format, ... );
+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,484 +31,463 @@
 #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,
-    0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
+	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
-    0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
+	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
-    0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
+	0x00FF, 0x00D6, 0x00DC, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192,
-    0x00FF, 0x00D6, 0x00DC, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192,
+	0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
-    0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
+	0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
-    0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
+	0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
-    0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
+	0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
-    0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
+	0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
-    0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+	0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4,
-    0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4,
+	0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229,
-    0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229,
+	0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248,
-    0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248,
+	0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
-    0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
 };
 
 #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,
-    0x0000, 0x0000, 0x00E9, 0x00E2, 0x0000, 0x00E0, 0x0000, 0x00E7,
+	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x0000, 0x0000, 0x0000,
-    0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x0651, 0x0652, 0x00F4, 0x00A4, 0x0640, 0x00FB, 0x00F9,
-    0x0000, 0x0651, 0x0652, 0x00F4, 0x00A4, 0x0640, 0x00FB, 0x00F9,
+	0x0621, 0x0622, 0x0623, 0x0624, 0x00A3, 0x0625, 0x0626, 0x0627,
-    0x0621, 0x0622, 0x0623, 0x0624, 0x00A3, 0x0625, 0x0626, 0x0627,
+	0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F,
-    0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F,
+	0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x00AB, 0x00BB,
-    0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
+	0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
-    0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
+	0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
-    0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
+	0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
-    0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+	0x0636, 0x0637, 0x0638, 0x0639, 0x063A, 0x0641, 0x00B5, 0x0642,
-    0x0636, 0x0637, 0x0638, 0x0639, 0x063A, 0x0641, 0x00B5, 0x0642,
+	0x0643, 0x0644, 0x0645, 0x0646, 0x0647, 0x0648, 0x0649, 0x064A,
-    0x0643, 0x0644, 0x0645, 0x0646, 0x0647, 0x0648, 0x0649, 0x064A,
+	0x2261, 0x064B, 0x064C, 0x064D, 0x064E, 0x064F, 0xO650, 0x2248,
-    0x2261, 0x064B, 0x064C, 0x064D, 0x064E, 0x064F, 0xO650, 0x2248,
+	0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
-    0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
 };
 
 #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,
-    0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398,
+	0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, 0x03A0,
-    0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, 0x03A0,
+	0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9,
-    0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9,
+	0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, 0x03B8,
-    0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, 0x03B8,
+	0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, 0x03C0,
-    0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, 0x03C0,
+	0x03C1, 0x03C3, 0x03C2, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8,
-    0x03C1, 0x03C3, 0x03C2, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
+	0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
-    0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
+	0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
-    0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
+	0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
-    0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+	0x03C9, 0x03AC, 0x03AD, 0x03AE, 0x03CA, 0x03AF, 0x03CC, 0x03CD,
-    0x03C9, 0x03AC, 0x03AD, 0x03AE, 0x03CA, 0x03AF, 0x03CC, 0x03CD,
+	0x03CB, 0x03CE, 0x0386, 0x0388, 0x0389, 0x038A, 0x038C, 0x038E,
-    0x03CB, 0x03CE, 0x0386, 0x0388, 0x0389, 0x038A, 0x038C, 0x038E,
+	0x038F, 0x00B1, 0x2265, 0x2264, 0x03AA, 0x03AB, 0x00F7, 0x2248,
-    0x038F, 0x00B1, 0x2265, 0x2264, 0x03AA, 0x03AB, 0x00F7, 0x2248,
+	0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
-    0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
 };
 
 #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,
-    0x0106, 0x00FC, 0x00E9, 0x0101, 0x00E4, 0x0123, 0x00E5, 0x0107,
+	0x0142, 0x0113, 0x0156, 0x0157, 0x012B, 0x0179, 0x00C4, 0x00C5,
-    0x0142, 0x0113, 0x0156, 0x0157, 0x012B, 0x0179, 0x00C4, 0x00C5,
+	0x00C9, 0x00E6, 0x00C6, 0x014D, 0x00F6, 0x0122, 0x00A2, 0x015A,
-    0x00C9, 0x00E6, 0x00C6, 0x014D, 0x00F6, 0x0122, 0x00A2, 0x015A,
+	0x015B, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x00A4,
-    0x015B, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x00A4,
+	0x0100, 0x012A, 0x00F3, 0x017B, 0x017C, 0x017A, 0x201D, 0x00A6,
-    0x0100, 0x012A, 0x00F3, 0x017B, 0x017C, 0x017A, 0x201D, 0x00A6,
+	0x00A9, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x0141, 0x00AB, 0x00BB,
-    0x00A9, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x0141, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x0104, 0x010C, 0x0118,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x0104, 0x010C, 0x0118,
+	0x0116, 0x2563, 0x2551, 0x2557, 0x255D, 0x012E, 0x0160, 0x2510,
-    0x0116, 0x2563, 0x2551, 0x2557, 0x255D, 0x012E, 0x0160, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x0172, 0x016A,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x0172, 0x016A,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x017D,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x017D,
+	0x0105, 0x010D, 0x0119, 0x0117, 0x012F, 0x0161, 0x0173, 0x016B,
-    0x0105, 0x010D, 0x0119, 0x0117, 0x012F, 0x0161, 0x0173, 0x016B,
+	0x017E, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
-    0x017E, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+	0x00D3, 0x00DF, 0x014C, 0x0143, 0x00F5, 0x00D5, 0x00B5, 0x0144,
-    0x00D3, 0x00DF, 0x014C, 0x0143, 0x00F5, 0x00D5, 0x00B5, 0x0144,
+	0x0136, 0x0137, 0x013B, 0x013C, 0x0146, 0x0112, 0x0145, 0x2019,
-    0x0136, 0x0137, 0x013B, 0x013C, 0x0146, 0x0112, 0x0145, 0x2019,
+	0x00AD, 0x00B1, 0x201C, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x201E,
-    0x00AD, 0x00B1, 0x201C, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x201E,
+	0x00B0, 0x2219, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0
-    0x00B0, 0x2219, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0
 };
 
 #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,
-    0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
+	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
-    0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
+	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
-    0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
+	0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x0192,
-    0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x0192,
+	0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
-    0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
+	0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
-    0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0,
+	0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510,
-    0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
+	0x00F0, 0x00D0, 0x00CA, 0x00CB, 0x00C8, 0x0131, 0x00CD, 0x00CE,
-    0x00F0, 0x00D0, 0x00CA, 0x00CB, 0x00C8, 0x0131, 0x00CD, 0x00CE,
+	0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00A6, 0x00CC, 0x2580,
-    0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00A6, 0x00CC, 0x2580,
+	0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x00FE,
-    0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x00FE,
+	0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4,
-    0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4,
+	0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8,
-    0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8,
+	0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0
-    0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0
 };
 
 #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,
-    0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x016F, 0x0107, 0x00E7,
+	0x0142, 0x00EB, 0x0150, 0x0151, 0x00EE, 0x0179, 0x00C4, 0x0106,
-    0x0142, 0x00EB, 0x0150, 0x0151, 0x00EE, 0x0179, 0x00C4, 0x0106,
+	0x00C9, 0x0139, 0x013A, 0x00F4, 0x00F6, 0x013D, 0x013E, 0x015A,
-    0x00C9, 0x0139, 0x013A, 0x00F4, 0x00F6, 0x013D, 0x013E, 0x015A,
+	0x015B, 0x00D6, 0x00DC, 0x0164, 0x0165, 0x0141, 0x00D7, 0x010D,
-    0x015B, 0x00D6, 0x00DC, 0x0164, 0x0165, 0x0141, 0x00D7, 0x010D,
+	0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x0104, 0x0105, 0x017D, 0x017E,
-    0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x0104, 0x0105, 0x017D, 0x017E,
+	0x0118, 0x0119, 0x00AC, 0x017A, 0x010C, 0x015F, 0x00AB, 0x00BB,
-    0x0118, 0x0119, 0x00AC, 0x017A, 0x010C, 0x015F, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x011A,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x011A,
+	0x015E, 0x2563, 0x2551, 0x2557, 0x255D, 0x017B, 0x017C, 0x2510,
-    0x015E, 0x2563, 0x2551, 0x2557, 0x255D, 0x017B, 0x017C, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x0102, 0x0103,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x0102, 0x0103,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
+	0x0111, 0x0110, 0x010E, 0x00CB, 0x010F, 0x0147, 0x00CD, 0x00CE,
-    0x0111, 0x0110, 0x010E, 0x00CB, 0x010F, 0x0147, 0x00CD, 0x00CE,
+	0x011B, 0x2518, 0x250C, 0x2588, 0x2584, 0x0162, 0x016E, 0x2580,
-    0x011B, 0x2518, 0x250C, 0x2588, 0x2584, 0x0162, 0x016E, 0x2580,
+	0x00D3, 0x00DF, 0x00D4, 0x0143, 0x0144, 0x0148, 0x0160, 0x0161,
-    0x00D3, 0x00DF, 0x00D4, 0x0143, 0x0144, 0x0148, 0x0160, 0x0161,
+	0x0154, 0x00DA, 0x0155, 0x0170, 0x00FD, 0x00DD, 0x0163, 0x00B4,
-    0x0154, 0x00DA, 0x0155, 0x0170, 0x00FD, 0x00DD, 0x0163, 0x00B4,
+	0x00AD, 0x02DD, 0x02DB, 0x02C7, 0x02D8, 0x00A7, 0x00F7, 0x00B8,
-    0x00AD, 0x02DD, 0x02DB, 0x02C7, 0x02D8, 0x00A7, 0x00F7, 0x00B8,
+	0x00B0, 0x00A8, 0x02D9, 0x0171, 0x0158, 0x0159, 0x25A0, 0x00A0
-    0x00B0, 0x00A8, 0x02D9, 0x0171, 0x0158, 0x0159, 0x25A0, 0x00A0
 };
 
 #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,
-    0x0452, 0x0402, 0x0453, 0x0403, 0x0451, 0x0401, 0x0454, 0x0404,
+	0x0455, 0x0405, 0x0456, 0x0406, 0x0457, 0x0407, 0x0458, 0x0408,
-    0x0455, 0x0405, 0x0456, 0x0406, 0x0457, 0x0407, 0x0458, 0x0408,
+	0x0459, 0x0409, 0x045A, 0x040A, 0x045B, 0x040B, 0x045C, 0x040C,
-    0x0459, 0x0409, 0x045A, 0x040A, 0x045B, 0x040B, 0x045C, 0x040C,
+	0x045E, 0x040E, 0x045F, 0x040F, 0x044E, 0x042E, 0x044A, 0x042A,
-    0x045E, 0x040E, 0x045F, 0x040F, 0x044E, 0x042E, 0x044A, 0x042A,
+	0x0430, 0x0410, 0x0431, 0x0411, 0x0446, 0x0426, 0x0434, 0x0414,
-    0x0430, 0x0410, 0x0431, 0x0411, 0x0446, 0x0426, 0x0434, 0x0414,
+	0x0435, 0x0415, 0x0444, 0x0424, 0x0433, 0x0413, 0x00AB, 0x00BB,
-    0x0435, 0x0415, 0x0444, 0x0424, 0x0433, 0x0413, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x0445, 0x0425, 0x0438,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x0445, 0x0425, 0x0438,
+	0x0418, 0x2563, 0x2551, 0x2557, 0x255D, 0x0439, 0x0419, 0x2510,
-    0x0418, 0x2563, 0x2551, 0x2557, 0x255D, 0x0439, 0x0419, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x043A, 0x041A,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x043A, 0x041A,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
+	0x043B, 0x041B, 0x043C, 0x041C, 0x043D, 0x041D, 0x043E, 0x041E,
-    0x043B, 0x041B, 0x043C, 0x041C, 0x043D, 0x041D, 0x043E, 0x041E,
+	0x043F, 0x2518, 0x250C, 0x2588, 0x2584, 0x041F, 0x044F, 0x2580,
-    0x043F, 0x2518, 0x250C, 0x2588, 0x2584, 0x041F, 0x044F, 0x2580,
+	0x042F, 0x0440, 0x0420, 0x0441, 0x0421, 0x0442, 0x0422, 0x0443,
-    0x042F, 0x0440, 0x0420, 0x0441, 0x0421, 0x0442, 0x0422, 0x0443,
+	0x0423, 0x0436, 0x0416, 0x0432, 0x0412, 0x044C, 0x042C, 0x2116,
-    0x0423, 0x0436, 0x0416, 0x0432, 0x0412, 0x044C, 0x042C, 0x2116,
+	0x00AD, 0x044B, 0x042B, 0x0437, 0x0417, 0x0448, 0x0428, 0x044D,
-    0x00AD, 0x044B, 0x042B, 0x0437, 0x0417, 0x0448, 0x0428, 0x044D,
+	0x042D, 0x0449, 0x0429, 0x0447, 0x0427, 0x00A7, 0x25A0, 0x00A0
-    0x042D, 0x0449, 0x0429, 0x0447, 0x0427, 0x00A7, 0x25A0, 0x00A0
 };
 
 #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,
-    0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
+	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x0131, 0x00C4, 0x00C5,
-    0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x0131, 0x00C4, 0x00C5,
+	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
-    0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
+	0x0130, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x015E, 0x015F,
-    0x0130, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x015E, 0x015F,
+	0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x011E, 0x011F,
-    0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x011E, 0x011F,
+	0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
-    0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0,
+	0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510,
-    0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
+	0x00BA, 0x00AA, 0x00CA, 0x00CB, 0x00C8, 0x0000, 0x00CD, 0x00CE,
-    0x00BA, 0x00AA, 0x00CA, 0x00CB, 0x00C8, 0x0000, 0x00CD, 0x00CE,
+	0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00A6, 0x00CC, 0x2580,
-    0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00A6, 0x00CC, 0x2580,
+	0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x0000,
-    0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x0000,
+	0x00D7, 0x00DA, 0x00DB, 0x00D9, 0x00EC, 0x00FF, 0x00AF, 0x00B4,
-    0x00D7, 0x00DA, 0x00DB, 0x00D9, 0x00EC, 0x00FF, 0x00AF, 0x00B4,
+	0x00AD, 0x00B1, 0x0000, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8,
-    0x00AD, 0x00B1, 0x0000, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8,
+	0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0
-    0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0
 };
 
 #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,
-    0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
+	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
-    0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
+	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
-    0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
+	0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x0192,
-    0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x0192,
+	0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
-    0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
+	0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
-    0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0,
+	0x00A9, 0x2563, 0x2551, 0x2557, 0x2550, 0x00A2, 0x00A5, 0x2510,
-    0x00A9, 0x2563, 0x2551, 0x2557, 0x2550, 0x00A2, 0x00A5, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
+	0x00F0, 0x00D0, 0x00CA, 0x00CB, 0x00C8, 0x20AC, 0x00CD, 0x00CE,
-    0x00F0, 0x00D0, 0x00CA, 0x00CB, 0x00C8, 0x20AC, 0x00CD, 0x00CE,
+	0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00C6, 0x00CC, 0x2580,
-    0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00C6, 0x00CC, 0x2580,
+	0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x00FE,
-    0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x00FE,
+	0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4,
-    0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4,
+	0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8,
-    0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8,
+	0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0
-    0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0
 };
 
 #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,
-    0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7,
+	0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
-    0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
+	0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7,
-    0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7,
+	0x05E8, 0x05E9, 0x05EA, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192,
-    0x05E8, 0x05E9, 0x05EA, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192,
+	0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
-    0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
+	0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
-    0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
+	0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
-    0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
+	0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
-    0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
+	0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
-    0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+	0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4,
-    0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4,
+	0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229,
-    0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229,
+	0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248,
-    0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248,
+	0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
-    0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
 };
 
 #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,
-    0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
+	0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
-    0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
+	0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
-    0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
+	0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
-    0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
+	0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
-    0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
+	0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
-    0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
+	0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
-    0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
+	0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
-    0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
+	0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
-    0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+	0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
-    0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
+	0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F,
-    0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F,
+	0x0401, 0x0451, 0x0404, 0x0454, 0x0407, 0x0457, 0x040E, 0x045E,
-    0x0401, 0x0451, 0x0404, 0x0454, 0x0407, 0x0457, 0x040E, 0x045E,
+	0x00B0, 0x2219, 0x00B7, 0x221A, 0x2116, 0x00A4, 0x25A0, 0x00A0
-    0x00B0, 0x2219, 0x00B7, 0x221A, 0x2116, 0x00A4, 0x25A0, 0x00A0
 };
 
 #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,
-    0x20AC, 0x0000, 0x0000, 0x0000, 0x0000, 0x2026, 0x0000, 0x0000,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x00A0, 0x0E01, 0x0E02, 0x0E03, 0x0E04, 0x0E05, 0x0E06, 0x0E07,
-    0x00A0, 0x0E01, 0x0E02, 0x0E03, 0x0E04, 0x0E05, 0x0E06, 0x0E07,
+	0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F,
-    0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F,
+	0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17,
-    0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17,
+	0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E, 0x0E1F,
-    0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E, 0x0E1F,
+	0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27,
-    0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27,
+	0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F,
-    0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F,
+	0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
-    0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
+	0x0E38, 0x0E39, 0x0E3A, 0x0000, 0x0000, 0x0000, 0x0000, 0x0E3F,
-    0x0E38, 0x0E39, 0x0E3A, 0x0000, 0x0000, 0x0000, 0x0000, 0x0E3F,
+	0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47,
-    0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47,
+	0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F,
-    0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F,
+	0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57,
-    0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57,
+	0x0E58, 0x0E59, 0x0E5A, 0x0E5B, 0x0000, 0x0000, 0x0000, 0x0000
-    0x0E58, 0x0E59, 0x0E5A, 0x0E5B, 0x0000, 0x0000, 0x0000, 0x0000
 };
 
 #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,
-    0x20AC, 0x0000, 0x201A, 0x0000, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x0000, 0x2030, 0x0160, 0x2039, 0x015A, 0x0164, 0x017D, 0x0179,
-    0x0000, 0x2030, 0x0160, 0x2039, 0x015A, 0x0164, 0x017D, 0x0179,
+	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x0000, 0x2122, 0x0161, 0x203A, 0x015B, 0x0165, 0x017E, 0x017A,
-    0x0000, 0x2122, 0x0161, 0x203A, 0x015B, 0x0165, 0x017E, 0x017A,
+	0x00A0, 0x02C7, 0x02D8, 0x0141, 0x00A4, 0x0104, 0x00A6, 0x00A7,
-    0x00A0, 0x02C7, 0x02D8, 0x0141, 0x00A4, 0x0104, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x015E, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x017B,
-    0x00A8, 0x00A9, 0x015E, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x017B,
+	0x00B0, 0x00B1, 0x02DB, 0x0142, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B0, 0x00B1, 0x02DB, 0x0142, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x0105, 0x015F, 0x00BB, 0x013D, 0x02DD, 0x013E, 0x017C,
-    0x00B8, 0x0105, 0x015F, 0x00BB, 0x013D, 0x02DD, 0x013E, 0x017C,
+	0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7,
-    0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7,
+	0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E,
-    0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E,
+	0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7,
-    0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7,
+	0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF,
-    0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF,
+	0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7,
-    0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7,
+	0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F,
-    0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F,
+	0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7,
-    0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7,
+	0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9
-    0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9
 };
 
 #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,
-    0x0402, 0x0403, 0x201A, 0x0453, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x20AC, 0x2030, 0x0409, 0x2039, 0x040A, 0x040C, 0x040B, 0x040F,
-    0x20AC, 0x2030, 0x0409, 0x2039, 0x040A, 0x040C, 0x040B, 0x040F,
+	0x0452, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0452, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x0000, 0x2111, 0x0459, 0x203A, 0x045A, 0x045C, 0x045B, 0x045F,
-    0x0000, 0x2111, 0x0459, 0x203A, 0x045A, 0x045C, 0x045B, 0x045F,
+	0x00A0, 0x040E, 0x045E, 0x0408, 0x00A4, 0x0490, 0x00A6, 0x00A7,
-    0x00A0, 0x040E, 0x045E, 0x0408, 0x00A4, 0x0490, 0x00A6, 0x00A7,
+	0x0401, 0x00A9, 0x0404, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x0407,
-    0x0401, 0x00A9, 0x0404, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x0407,
+	0x00B0, 0x00B1, 0x0406, 0x0456, 0x0491, 0x00B5, 0x00B6, 0x00B7,
-    0x00B0, 0x00B1, 0x0406, 0x0456, 0x0491, 0x00B5, 0x00B6, 0x00B7,
+	0x0451, 0x2116, 0x0454, 0x00BB, 0x0458, 0x0405, 0x0455, 0x0457,
-    0x0451, 0x2116, 0x0454, 0x00BB, 0x0458, 0x0405, 0x0455, 0x0457,
+	0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
-    0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
+	0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
-    0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
+	0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
-    0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
+	0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
-    0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
+	0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
-    0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
+	0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
-    0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
+	0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
-    0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
+	0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F
-    0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F
 };
 
 #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,
-    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x017D, 0x0000,
-    0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x017D, 0x0000,
+	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x0000, 0x017E, 0x0178,
-    0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x0000, 0x017E, 0x0178,
+	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-    0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
-    0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
-    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
-    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+	0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
-    0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
+	0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
-    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
-    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
-    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+	0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
-    0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+	0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF
-    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF
 };
 
 #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,
-    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x0000, 0x2030, 0x0000, 0x2039, 0x000C, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x2030, 0x0000, 0x2039, 0x000C, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x0000, 0x2122, 0x0000, 0x203A, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x2122, 0x0000, 0x203A, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x00A0, 0x0385, 0x0386, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-    0x00A0, 0x0385, 0x0386, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x0000, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x2015,
-    0x00A8, 0x00A9, 0x0000, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x2015,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x00B5, 0x00B6, 0x00B7,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x00B5, 0x00B6, 0x00B7,
+	0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F,
-    0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F,
+	0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
-    0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
+	0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
-    0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
+	0x03A0, 0x03A1, 0x0000, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7,
-    0x03A0, 0x03A1, 0x0000, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7,
+	0x03A8, 0x03A9, 0x03AA, 0x03AD, 0x03AC, 0x03AD, 0x03AE, 0x03AF,
-    0x03A8, 0x03A9, 0x03AA, 0x03AD, 0x03AC, 0x03AD, 0x03AE, 0x03AF,
+	0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7,
-    0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7,
+	0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
-    0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
+	0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7,
-    0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7,
+	0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, 0x0000
-    0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, 0x0000
 };
 
 #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,
-    0x20AC, 0x0000, 0x210A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x0000, 0x0000,
-    0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x0000, 0x0000, 0x0178,
-    0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x0000, 0x0000, 0x0178,
+	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-    0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
-    0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
-    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
-    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+	0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
-    0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
+	0x00D8, 0x00D9, 0x00DA, 0x00BD, 0x00DC, 0x0130, 0x015E, 0x00DF,
-    0x00D8, 0x00D9, 0x00DA, 0x00BD, 0x00DC, 0x0130, 0x015E, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
-    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
-    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+	0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
-    0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+	0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF
-    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF
 };
 
 #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,
-    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x02C6, 0x2030, 0x0000, 0x2039, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x02C6, 0x2030, 0x0000, 0x2039, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x02DC, 0x2122, 0x0000, 0x203A, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x02DC, 0x2122, 0x0000, 0x203A, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-    0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
-    0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+	0x05B0, 0x05B1, 0x05B2, 0x05B3, 0x05B4, 0x05B5, 0x05B6, 0x05B7,
-    0x05B0, 0x05B1, 0x05B2, 0x05B3, 0x05B4, 0x05B5, 0x05B6, 0x05B7,
+	0x05B8, 0x05B9, 0x0000, 0x05BB, 0x05BC, 0x05BD, 0x05BE, 0x05BF,
-    0x05B8, 0x05B9, 0x0000, 0x05BB, 0x05BC, 0x05BD, 0x05BE, 0x05BF,
+	0x05C0, 0x05C1, 0x05C2, 0x05C3, 0x05F0, 0x05F1, 0x05F2, 0x05F3,
-    0x05C0, 0x05C1, 0x05C2, 0x05C3, 0x05F0, 0x05F1, 0x05F2, 0x05F3,
+	0x05F4, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x05F4, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7,
-    0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7,
+	0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
-    0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
+	0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7,
-    0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7,
+	0x05E8, 0x05E9, 0x05EA, 0x0000, 0x0000, 0x200E, 0x200F, 0x0000
-    0x05E8, 0x05E9, 0x05EA, 0x0000, 0x0000, 0x200E, 0x200F, 0x0000
 };
 
 #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,
-    0x20AC, 0x067E, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x02C6, 0x2030, 0x0679, 0x2039, 0x0152, 0x0686, 0x0698, 0x0688,
-    0x02C6, 0x2030, 0x0679, 0x2039, 0x0152, 0x0686, 0x0698, 0x0688,
+	0x06AF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x06AF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x06A9, 0x2122, 0x0691, 0x203A, 0x0153, 0x200C, 0x200D, 0x06BA,
-    0x06A9, 0x2122, 0x0691, 0x203A, 0x0153, 0x200C, 0x200D, 0x06BA,
+	0x00A0, 0x060C, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-    0x00A0, 0x060C, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x06BE, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-    0x00A8, 0x00A9, 0x06BE, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x00B9, 0x061B, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x061F,
-    0x00B8, 0x00B9, 0x061B, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x061F,
+	0x06C1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627,
-    0x06C1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627,
+	0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F,
-    0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F,
+	0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x00D7,
-    0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x00D7,
+	0x0637, 0x0638, 0x0639, 0x063A, 0x0640, 0x0640, 0x0642, 0x0643,
-    0x0637, 0x0638, 0x0639, 0x063A, 0x0640, 0x0640, 0x0642, 0x0643,
+	0x00E0, 0x0644, 0x00E2, 0x0645, 0x0646, 0x0647, 0x0648, 0x00E7,
-    0x00E0, 0x0644, 0x00E2, 0x0645, 0x0646, 0x0647, 0x0648, 0x00E7,
+	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0649, 0x064A, 0x00EE, 0x00EF,
-    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0649, 0x064A, 0x00EE, 0x00EF,
+	0x064B, 0x064C, 0x064D, 0x064E, 0x00F4, 0x064F, 0x0650, 0x00F7,
-    0x064B, 0x064C, 0x064D, 0x064E, 0x00F4, 0x064F, 0x0650, 0x00F7,
+	0x0651, 0x00F9, 0x0652, 0x00FB, 0x00FC, 0x200E, 0x200F, 0x06D2
-    0x0651, 0x00F9, 0x0652, 0x00FB, 0x00FC, 0x200E, 0x200F, 0x06D2
 }
 
 #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,
-    0x20AC, 0x0000, 0x201A, 0x0000, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x0000, 0x2030, 0x0000, 0x2039, 0x0000, 0x00A8, 0x02C7, 0x00B8,
-    0x0000, 0x2030, 0x0000, 0x2039, 0x0000, 0x00A8, 0x02C7, 0x00B8,
+	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x0000, 0x2122, 0x0000, 0x203A, 0x0000, 0x00AF, 0x02DB, 0x0000,
-    0x0000, 0x2122, 0x0000, 0x203A, 0x0000, 0x00AF, 0x02DB, 0x0000,
+	0x00A0, 0x0000, 0x00A2, 0x00A3, 0x00A4, 0x0000, 0x00A6, 0x00A7,
-    0x00A0, 0x0000, 0x00A2, 0x00A3, 0x00A4, 0x0000, 0x00A6, 0x00A7,
+	0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-    0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6,
-    0x00B8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6,
+	0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112,
-    0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112,
+	0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B,
-    0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B,
+	0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7,
-    0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7,
+	0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF,
-    0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF,
+	0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113,
-    0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113,
+	0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C,
-    0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C,
+	0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7,
-    0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7,
+	0x0173, 0x014E, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x02D9
-    0x0173, 0x014E, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x02D9
 };
 
 #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,
-    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x02C6, 0x2030, 0x0000, 0x2039, 0x0152, 0x0000, 0x0000, 0x0000,
-    0x02C6, 0x2030, 0x0000, 0x2039, 0x0152, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x02DC, 0x2122, 0x0000, 0x203A, 0x0153, 0x0000, 0x0000, 0x0178,
-    0x02DC, 0x2122, 0x0000, 0x203A, 0x0153, 0x0000, 0x0000, 0x0178,
+	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+	0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-    0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+	0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
-    0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+	0x00C0, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
-    0x00C0, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x0300, 0x00CD, 0x00CE, 0x00CF,
-    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x0300, 0x00CD, 0x00CE, 0x00CF,
+	0x0110, 0x00D1, 0x0309, 0x00D3, 0x00D4, 0x01A0, 0x00D6, 0x00D7,
-    0x0110, 0x00D1, 0x0309, 0x00D3, 0x00D4, 0x01A0, 0x00D6, 0x00D7,
+	0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x01AF, 0x0303, 0x00DF,
-    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x01AF, 0x0303, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
-    0x00E0, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0301, 0x00ED, 0x00EE, 0x00EF,
-    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0301, 0x00ED, 0x00EE, 0x00EF,
+	0x0111, 0x00F1, 0x0323, 0x00F3, 0x00F4, 0x01A1, 0x00F6, 0x00F7,
-    0x0111, 0x00F1, 0x0323, 0x00F3, 0x00F4, 0x01A1, 0x00F6, 0x00F7,
+	0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x01B0, 0x20AB, 0x00FF
-    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x01B0, 0x20AB, 0x00FF
 };
 
 #endif
@@ -519,54 +498,43 @@ const WCHAR Tbl[] =     /*  CP1258(0x80-0xFF) to Unicode conversion table */
 #endif
 
 
-WCHAR ff_convert (  /* Converted character, Returns zero on error */
+WCHAR ff_convert (	/* Converted character, Returns zero on error */
-    WCHAR   src,    /* Character code to be converted */
+	WCHAR	src,	/* Character code to be converted */
-    UINT    dir     /* 0: Unicode to OEMCP, 1: OEMCP to Unicode */
+	UINT	dir		/* 0: Unicode to OEMCP, 1: OEMCP to Unicode */
 )
 {
-    WCHAR c;
+	WCHAR c;
 
 
-    if ( src < 0x80 )   /* ASCII */
+	if (src < 0x80) {	/* ASCII */
-    {
+		c = src;
-        c = src;
 
-    }
+	} else {
-    else
+		if (dir) {		/* OEMCP to Unicode */
-    {
+			c = (src >= 0x100) ? 0 : Tbl[src - 0x80];
-        if ( dir )      /* OEMCP to Unicode */
-        {
-            c = ( src >= 0x100 ) ? 0 : Tbl[src - 0x80];
 
-        }
+		} else {		/* Unicode to OEMCP */
-        else            /* Unicode to OEMCP */
+			for (c = 0; c < 0x80; c++) {
-        {
+				if (src == Tbl[c]) break;
-            for ( c = 0; c < 0x80; c++ )
+			}
-            {
+			c = (c + 0x80) & 0xFF;
-                if ( src == Tbl[c] )
+		}
-                {
+	}
-                    break;
-                }
-            }
 
-            c = ( c + 0x80 ) & 0xFF;
+	return c;
-        }
-    }
-
-    return c;
 }
 
 
-WCHAR ff_wtoupper ( /* Upper converted character */
+WCHAR ff_wtoupper (	/* Upper converted character */
-    WCHAR chr       /* Input character */
+	WCHAR chr		/* Input character */
 )
 {
-    static const WCHAR tbl_lower[] = { 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0xA1, 0x00A2, 0x00A3, 0x00A5, 0x00AC, 0x00AF, 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0x0FF, 0x101, 0x103, 0x105, 0x107, 0x109, 0x10B, 0x10D, 0x10F, 0x111, 0x113, 0x115, 0x117, 0x119, 0x11B, 0x11D, 0x11F, 0x121, 0x123, 0x125, 0x127, 0x129, 0x12B, 0x12D, 0x12F, 0x131, 0x133, 0x135, 0x137, 0x13A, 0x13C, 0x13E, 0x140, 0x142, 0x144, 0x146, 0x148, 0x14B, 0x14D, 0x14F, 0x151, 0x153, 0x155, 0x157, 0x159, 0x15B, 0x15D, 0x15F, 0x161, 0x163, 0x165, 0x167, 0x169, 0x16B, 0x16D, 0x16F, 0x171, 0x173, 0x175, 0x177, 0x17A, 0x17C, 0x17E, 0x192, 0x3B1, 0x3B2, 0x3B3, 0x3B4, 0x3B5, 0x3B6, 0x3B7, 0x3B8, 0x3B9, 0x3BA, 0x3BB, 0x3BC, 0x3BD, 0x3BE, 0x3BF, 0x3C0, 0x3C1, 0x3C3, 0x3C4, 0x3C5, 0x3C6, 0x3C7, 0x3C8, 0x3C9, 0x3CA, 0x430, 0x431, 0x432, 0x433, 0x434, 0x435, 0x436, 0x437, 0x438, 0x439, 0x43A, 0x43B, 0x43C, 0x43D, 0x43E, 0x43F, 0x440, 0x441, 0x442, 0x443, 0x444, 0x445, 0x446, 0x447, 0x448, 0x449, 0x44A, 0x44B, 0x44C, 0x44D, 0x44E, 0x44F, 0x451, 0x452, 0x453, 0x454, 0x455, 0x456, 0x457, 0x458, 0x459, 0x45A, 0x45B, 0x45C, 0x45E, 0x45F, 0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x217A, 0x217B, 0x217C, 0x217D, 0x217E, 0x217F, 0xFF41, 0xFF42, 0xFF43, 0xFF44, 0xFF45, 0xFF46, 0xFF47, 0xFF48, 0xFF49, 0xFF4A, 0xFF4B, 0xFF4C, 0xFF4D, 0xFF4E, 0xFF4F, 0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57, 0xFF58, 0xFF59, 0xFF5A, 0 };
+	static const WCHAR tbl_lower[] = { 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0xA1, 0x00A2, 0x00A3, 0x00A5, 0x00AC, 0x00AF, 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0x0FF, 0x101, 0x103, 0x105, 0x107, 0x109, 0x10B, 0x10D, 0x10F, 0x111, 0x113, 0x115, 0x117, 0x119, 0x11B, 0x11D, 0x11F, 0x121, 0x123, 0x125, 0x127, 0x129, 0x12B, 0x12D, 0x12F, 0x131, 0x133, 0x135, 0x137, 0x13A, 0x13C, 0x13E, 0x140, 0x142, 0x144, 0x146, 0x148, 0x14B, 0x14D, 0x14F, 0x151, 0x153, 0x155, 0x157, 0x159, 0x15B, 0x15D, 0x15F, 0x161, 0x163, 0x165, 0x167, 0x169, 0x16B, 0x16D, 0x16F, 0x171, 0x173, 0x175, 0x177, 0x17A, 0x17C, 0x17E, 0x192, 0x3B1, 0x3B2, 0x3B3, 0x3B4, 0x3B5, 0x3B6, 0x3B7, 0x3B8, 0x3B9, 0x3BA, 0x3BB, 0x3BC, 0x3BD, 0x3BE, 0x3BF, 0x3C0, 0x3C1, 0x3C3, 0x3C4, 0x3C5, 0x3C6, 0x3C7, 0x3C8, 0x3C9, 0x3CA, 0x430, 0x431, 0x432, 0x433, 0x434, 0x435, 0x436, 0x437, 0x438, 0x439, 0x43A, 0x43B, 0x43C, 0x43D, 0x43E, 0x43F, 0x440, 0x441, 0x442, 0x443, 0x444, 0x445, 0x446, 0x447, 0x448, 0x449, 0x44A, 0x44B, 0x44C, 0x44D, 0x44E, 0x44F, 0x451, 0x452, 0x453, 0x454, 0x455, 0x456, 0x457, 0x458, 0x459, 0x45A, 0x45B, 0x45C, 0x45E, 0x45F, 0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x217A, 0x217B, 0x217C, 0x217D, 0x217E, 0x217F, 0xFF41, 0xFF42, 0xFF43, 0xFF44, 0xFF45, 0xFF46, 0xFF47, 0xFF48, 0xFF49, 0xFF4A, 0xFF4B, 0xFF4C, 0xFF4D, 0xFF4E, 0xFF4F, 0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57, 0xFF58, 0xFF59, 0xFF5A, 0 };
-    static const WCHAR tbl_upper[] = { 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x21, 0xFFE0, 0xFFE1, 0xFFE5, 0xFFE2, 0xFFE3, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0x178, 0x100, 0x102, 0x104, 0x106, 0x108, 0x10A, 0x10C, 0x10E, 0x110, 0x112, 0x114, 0x116, 0x118, 0x11A, 0x11C, 0x11E, 0x120, 0x122, 0x124, 0x126, 0x128, 0x12A, 0x12C, 0x12E, 0x130, 0x132, 0x134, 0x136, 0x139, 0x13B, 0x13D, 0x13F, 0x141, 0x143, 0x145, 0x147, 0x14A, 0x14C, 0x14E, 0x150, 0x152, 0x154, 0x156, 0x158, 0x15A, 0x15C, 0x15E, 0x160, 0x162, 0x164, 0x166, 0x168, 0x16A, 0x16C, 0x16E, 0x170, 0x172, 0x174, 0x176, 0x179, 0x17B, 0x17D, 0x191, 0x391, 0x392, 0x393, 0x394, 0x395, 0x396, 0x397, 0x398, 0x399, 0x39A, 0x39B, 0x39C, 0x39D, 0x39E, 0x39F, 0x3A0, 0x3A1, 0x3A3, 0x3A4, 0x3A5, 0x3A6, 0x3A7, 0x3A8, 0x3A9, 0x3AA, 0x410, 0x411, 0x412, 0x413, 0x414, 0x415, 0x416, 0x417, 0x418, 0x419, 0x41A, 0x41B, 0x41C, 0x41D, 0x41E, 0x41F, 0x420, 0x421, 0x422, 0x423, 0x424, 0x425, 0x426, 0x427, 0x428, 0x429, 0x42A, 0x42B, 0x42C, 0x42D, 0x42E, 0x42F, 0x401, 0x402, 0x403, 0x404, 0x405, 0x406, 0x407, 0x408, 0x409, 0x40A, 0x40B, 0x40C, 0x40E, 0x40F, 0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168, 0x2169, 0x216A, 0x216B, 0x216C, 0x216D, 0x216E, 0x216F, 0xFF21, 0xFF22, 0xFF23, 0xFF24, 0xFF25, 0xFF26, 0xFF27, 0xFF28, 0xFF29, 0xFF2A, 0xFF2B, 0xFF2C, 0xFF2D, 0xFF2E, 0xFF2F, 0xFF30, 0xFF31, 0xFF32, 0xFF33, 0xFF34, 0xFF35, 0xFF36, 0xFF37, 0xFF38, 0xFF39, 0xFF3A, 0 };
+	static const WCHAR tbl_upper[] = { 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x21, 0xFFE0, 0xFFE1, 0xFFE5, 0xFFE2, 0xFFE3, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0x178, 0x100, 0x102, 0x104, 0x106, 0x108, 0x10A, 0x10C, 0x10E, 0x110, 0x112, 0x114, 0x116, 0x118, 0x11A, 0x11C, 0x11E, 0x120, 0x122, 0x124, 0x126, 0x128, 0x12A, 0x12C, 0x12E, 0x130, 0x132, 0x134, 0x136, 0x139, 0x13B, 0x13D, 0x13F, 0x141, 0x143, 0x145, 0x147, 0x14A, 0x14C, 0x14E, 0x150, 0x152, 0x154, 0x156, 0x158, 0x15A, 0x15C, 0x15E, 0x160, 0x162, 0x164, 0x166, 0x168, 0x16A, 0x16C, 0x16E, 0x170, 0x172, 0x174, 0x176, 0x179, 0x17B, 0x17D, 0x191, 0x391, 0x392, 0x393, 0x394, 0x395, 0x396, 0x397, 0x398, 0x399, 0x39A, 0x39B, 0x39C, 0x39D, 0x39E, 0x39F, 0x3A0, 0x3A1, 0x3A3, 0x3A4, 0x3A5, 0x3A6, 0x3A7, 0x3A8, 0x3A9, 0x3AA, 0x410, 0x411, 0x412, 0x413, 0x414, 0x415, 0x416, 0x417, 0x418, 0x419, 0x41A, 0x41B, 0x41C, 0x41D, 0x41E, 0x41F, 0x420, 0x421, 0x422, 0x423, 0x424, 0x425, 0x426, 0x427, 0x428, 0x429, 0x42A, 0x42B, 0x42C, 0x42D, 0x42E, 0x42F, 0x401, 0x402, 0x403, 0x404, 0x405, 0x406, 0x407, 0x408, 0x409, 0x40A, 0x40B, 0x40C, 0x40E, 0x40F, 0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168, 0x2169, 0x216A, 0x216B, 0x216C, 0x216D, 0x216E, 0x216F, 0xFF21, 0xFF22, 0xFF23, 0xFF24, 0xFF25, 0xFF26, 0xFF27, 0xFF28, 0xFF29, 0xFF2A, 0xFF2B, 0xFF2C, 0xFF2D, 0xFF2E, 0xFF2F, 0xFF30, 0xFF31, 0xFF32, 0xFF33, 0xFF34, 0xFF35, 0xFF36, 0xFF37, 0xFF38, 0xFF39, 0xFF3A, 0 };
-    int i;
+	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;
+	return tbl_lower[i] ? tbl_upper[i] : chr;
 }

src/cfg.c

@@ -3,70 +3,57 @@
 #include "uart.h"
 #include "fileops.h"
 
-cfg_t CFG =
+cfg_t CFG = {
-{
+  .cfg_ver_maj = 1,
-    .cfg_ver_maj = 1,
+  .cfg_ver_min = 0,
-    .cfg_ver_min = 0,
+  .last_game_valid = 0,
-    .last_game_valid = 0,
+  .vidmode_menu = VIDMODE_AUTO,
-    .vidmode_menu = VIDMODE_AUTO,
+  .vidmode_game = VIDMODE_AUTO,
-    .vidmode_game = VIDMODE_AUTO,
+  .pair_mode_allowed = 0,
-    .pair_mode_allowed = 0,
+  .bsx_use_systime = 0,
-    .bsx_use_systime = 0,
+  .bsx_time = 0x0619970301180530LL
-    .bsx_time = 0x0619970301180530LL
 };
 
-int cfg_save()
+int cfg_save() {
-{
+  int err = 0;
-    int err = 0;
+  file_open(CFG_FILE, FA_CREATE_ALWAYS | FA_WRITE);
-    file_open( CFG_FILE, FA_CREATE_ALWAYS | FA_WRITE );
+  if(file_writeblock(&CFG, 0, sizeof(CFG)) < sizeof(CFG)) {
-
+    err = file_res;
-    if ( file_writeblock( &CFG, 0, sizeof( CFG ) ) < sizeof( CFG ) )
+  }
-    {
+  file_close();
-        err = file_res;
+  return err;
-    }
-
-    file_close();
-    return err;
 }
 
-int cfg_load()
+int cfg_load() {
-{
+  int err = 0;
-    int err = 0;
+  file_open(CFG_FILE, FA_READ);
-    file_open( CFG_FILE, FA_READ );
+  if(file_readblock(&CFG, 0, sizeof(CFG)) < sizeof(CFG)) {
-
+    err = file_res;
-    if ( file_readblock( &CFG, 0, sizeof( CFG ) ) < sizeof( CFG ) )
+  }
-    {
+  file_close();
-        err = file_res;
+  return err;
-    }
-
-    file_close();
-    return err;
 }
 
-int cfg_save_last_game( uint8_t *fn )
+int cfg_save_last_game(uint8_t *fn) {
-{
+  int err = 0;
-    int err = 0;
+  file_open(LAST_FILE, FA_CREATE_ALWAYS | FA_WRITE);
-    file_open( LAST_FILE, FA_CREATE_ALWAYS | FA_WRITE );
+  err = f_puts((const TCHAR*)fn, &file_handle);
-    err = f_puts( ( const TCHAR * )fn, &file_handle );
+  file_close();
-    file_close();
+  return err;
-    return err;
 }
 
-int cfg_get_last_game( uint8_t *fn )
+int cfg_get_last_game(uint8_t *fn) {
-{
+  int err = 0;
-    int err = 0;
+  file_open(LAST_FILE, FA_READ);
-    file_open( LAST_FILE, FA_READ );
+  f_gets((TCHAR*)fn, 255, &file_handle);
-    f_gets( ( TCHAR * )fn, 255, &file_handle );
+  file_close();
-    file_close();
+  return err;
-    return err;
 }
 
-void cfg_set_last_game_valid( uint8_t valid )
+void cfg_set_last_game_valid(uint8_t valid) {
-{
+  CFG.last_game_valid = valid;
-    CFG.last_game_valid = valid;
 }
 
-uint8_t cfg_is_last_game_valid()
+uint8_t cfg_is_last_game_valid() {
-{
+  return CFG.last_game_valid;
-    return CFG.last_game_valid;
 }

src/cfg.h

@@ -6,36 +6,34 @@
 #define CFG_FILE ((const uint8_t*)"/sd2snes/sd2snes.cfg")
 #define LAST_FILE ((const uint8_t*)"/sd2snes/lastgame.cfg")
 
-typedef enum
+typedef enum {
-{
+  VIDMODE_AUTO = 0,
-    VIDMODE_AUTO = 0,
+  VIDMODE_60,
-    VIDMODE_60,
+  VIDMODE_50
-    VIDMODE_50
 } cfg_vidmode_t;
 
-typedef struct _cfg_block
+typedef struct _cfg_block {
-{
+  uint8_t cfg_ver_maj;
-    uint8_t cfg_ver_maj;
+  uint8_t cfg_ver_min;
-    uint8_t cfg_ver_min;
+  uint8_t last_game_valid;
-    uint8_t last_game_valid;
+  uint8_t vidmode_menu;
-    uint8_t vidmode_menu;
+  uint8_t vidmode_game;
-    uint8_t vidmode_game;
+  uint8_t pair_mode_allowed;
-    uint8_t pair_mode_allowed;
+  uint8_t bsx_use_systime;
-    uint8_t bsx_use_systime;
+  uint64_t bsx_time;
-    uint64_t bsx_time;
 } cfg_t;
 
-int cfg_save( void );
+int cfg_save(void);
-int cfg_load( void );
+int cfg_load(void);
 
-int cfg_save_last_game( uint8_t *fn );
+int cfg_save_last_game(uint8_t *fn);
-int cfg_get_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_menu(void);
-cfg_vidmode_t cfg_get_vidmode_game( void );
+cfg_vidmode_t cfg_get_vidmode_game(void);
 
-void cfg_set_last_game_valid( uint8_t );
+void cfg_set_last_game_valid(uint8_t);
-uint8_t cfg_is_last_game_valid( void );
+uint8_t cfg_is_last_game_valid(void);
-uint8_t cfg_is_pair_mode_allowed( void );
+uint8_t cfg_is_pair_mode_allowed(void);
 
 #endif

src/cic.c

@@ -7,108 +7,74 @@
 char *cicstatenames[4] = { "CIC_OK", "CIC_FAIL", "CIC_PAIR", "CIC_SCIC" };
 char *cicstatefriendly[4] = {"Original or no CIC", "Original CIC(failed)", "SuperCIC enhanced", "SuperCIC detected, not used"};
 
-void print_cic_state()
+void print_cic_state() {
-{
+  printf("CIC state: %s\n", get_cic_statename(get_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];
-    return cicstatefriendly[state];
 }
 
-inline char *get_cic_statename( enum cicstates state )
+inline char *get_cic_statename(enum cicstates state) {
-{
+  return cicstatenames[state];
-    return cicstatenames[state];
 }
 
-enum cicstates get_cic_state()
+enum cicstates get_cic_state() {
-{
+  uint32_t count;
-    uint32_t count;
+  uint32_t togglecount = 0;
-    uint32_t togglecount = 0;
+  uint8_t state, state_old;
-    uint8_t state, state_old;
 
-    state_old = BITBAND( SNES_CIC_STATUS_REG->FIOPIN, SNES_CIC_STATUS_BIT );
+  state_old = BITBAND(SNES_CIC_STATUS_REG->FIOPIN, SNES_CIC_STATUS_BIT);
-
+/* this loop samples at ~10MHz */
-    /* this loop samples at ~10MHz */
+  for(count=0; count<CIC_SAMPLECOUNT; count++) {
-    for ( count = 0; count < CIC_SAMPLECOUNT; count++ )
+    state = BITBAND(SNES_CIC_STATUS_REG->FIOPIN, SNES_CIC_STATUS_BIT);
-    {
+    if(state != state_old) {
-        state = BITBAND( SNES_CIC_STATUS_REG->FIOPIN, SNES_CIC_STATUS_BIT );
+      togglecount++;
-
-        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 )
-    {
-        return CIC_PAIR;
-    }
-    else if ( togglecount > CIC_TOGGLE_THRESH_SCIC )
-    {
-        return CIC_SCIC;
-    }
-    else if ( state )
-    {
-        return CIC_OK;
-    }
-    else
-    {
-        return CIC_FAIL;
     }
+    state_old = state;
+  }
+  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) {
+    return CIC_SCIC;
+  } else if(state) {
+    return CIC_OK;
+  } else return CIC_FAIL;
 }
 
-void cic_init( int allow_pairmode )
+void cic_init(int allow_pairmode) {
-{
+  BITBAND(SNES_CIC_PAIR_REG->FIODIR, SNES_CIC_PAIR_BIT) = 1;
-    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;
-    if ( allow_pairmode )
+  } else {
-    {
+    BITBAND(SNES_CIC_PAIR_REG->FIOSET, SNES_CIC_PAIR_BIT) = 1;
-        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 )
+void cic_pair(int init_vmode, int init_d4) {
-{
+  cic_videomode(init_vmode);
-    cic_videomode( init_vmode );
+  cic_d4(init_d4);
-    cic_d4( init_d4 );
 
-    BITBAND( SNES_CIC_D0_REG->FIODIR, SNES_CIC_D0_BIT ) = 1;
+  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_D1_REG->FIODIR, SNES_CIC_D1_BIT) = 1;
 }
 
-void cic_videomode( int value )
+void cic_videomode(int value) {
-{
+  if(value) {
-    if ( value )
+    BITBAND(SNES_CIC_D0_REG->FIOSET, SNES_CIC_D0_BIT) = 1;
-    {
+  } else {
-        BITBAND( SNES_CIC_D0_REG->FIOSET, SNES_CIC_D0_BIT ) = 1;
+    BITBAND(SNES_CIC_D0_REG->FIOCLR, SNES_CIC_D0_BIT) = 1;
-    }
+  }
-    else
-    {
-        BITBAND( SNES_CIC_D0_REG->FIOCLR, SNES_CIC_D0_BIT ) = 1;
-    }
 }
 
-void cic_d4( int value )
+void cic_d4(int value) {
-{
+  if(value) {
-    if ( value )
+    BITBAND(SNES_CIC_D1_REG->FIOSET, SNES_CIC_D1_BIT) = 1;
-    {
+  } else {
-        BITBAND( SNES_CIC_D1_REG->FIOSET, SNES_CIC_D1_BIT ) = 1;
+    BITBAND(SNES_CIC_D1_REG->FIOCLR, SNES_CIC_D1_BIT) = 1;
-    }
+  }
-    else
-    {
-        BITBAND( SNES_CIC_D1_REG->FIOCLR, SNES_CIC_D1_BIT ) = 1;
-    }
 }
 

src/cic.h

@@ -1,9 +1,9 @@
 #ifndef _CIC_H
 #define _CIC_H
 
-#define CIC_SAMPLECOUNT (100000)
+#define CIC_SAMPLECOUNT	(100000)
-#define CIC_TOGGLE_THRESH_PAIR  (2500)
+#define CIC_TOGGLE_THRESH_PAIR	(2500)
-#define CIC_TOGGLE_THRESH_SCIC  (10)
+#define CIC_TOGGLE_THRESH_SCIC	(10)
 
 #include <arm/NXP/LPC17xx/LPC17xx.h>
 #include "bits.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 );
+void print_cic_state(void);
-char *get_cic_statename( enum cicstates state );
+char *get_cic_statename(enum cicstates state);
-char *get_cic_statefriendlyname( enum cicstates state );
+char *get_cic_statefriendlyname(enum cicstates state);
-enum cicstates get_cic_state( void );
+enum cicstates get_cic_state(void);
-void cic_init( int allow_pairmode );
+void cic_init(int allow_pairmode);
 
-void cic_pair( int init_vmode, int init_d4 );
+void cic_pair(int init_vmode, int init_d4);
-void cic_videomode( int value );
+void cic_videomode(int value);
-void cic_d4( int value );
+void cic_d4(int value);
 
 #endif

src/cli.h

@@ -27,8 +27,8 @@
 #ifndef CLI_H
 #define CLI_H
 
-void cli_init( void );
+void cli_init(void);
-void cli_loop( void );
+void cli_loop(void);
-void cli_entrycheck( void );
+void cli_entrycheck(void);
 
 #endif

src/clock.c

@@ -7,116 +7,103 @@
 #include "bits.h"
 #include "uart.h"
 
-void clock_disconnect()
+void clock_disconnect() {
-{
+  disconnectPLL0();
-    disconnectPLL0();
+  disablePLL0();
-    disablePLL0();
 }
 
-void clock_init()
+void clock_init() {
-{
 
-    /* set flash access time to 5 clks (80<f<=100MHz) */
+/* set flash access time to 5 clks (80<f<=100MHz) */
-    setFlashAccessTime( 5 );
+  setFlashAccessTime(5);
 
-    /* setup PLL0 for ~44100*256*8 Hz
+/* setup PLL0 for ~44100*256*8 Hz
-       Base clock: 12MHz
+   Base clock: 12MHz
-       Multiplier:  429
+   Multiplier:  429
-       Pre-Divisor:  19
+   Pre-Divisor:  19
-       Divisor:       6
+   Divisor:       6
-       (want: 90316800, get: 90315789.47)
+   (want: 90316800, get: 90315789.47)
-       -> DAC freq = 44099.5 Hz
+   -> DAC freq = 44099.5 Hz
-       -> FPGA freq = 11289473.7Hz
+   -> FPGA freq = 11289473.7Hz
-       First, disable and disconnect PLL0.
+   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.
+   reliably with PLL0 connected.
-       see:
+   see:
-       http://ics.nxp.com/support/documents/microcontrollers/pdf/errata.lpc1754.pdf
+   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
+   enable the xtal oscillator and wait for it to become stable
-       set the oscillator as clk source for PLL0
+   set the oscillator as clk source for PLL0
-       set PLL0 multiplier+predivider
+   set PLL0 multiplier+predivider
-       enable PLL0
+   enable PLL0
-       set CCLK divider
+   set CCLK divider
-       wait for PLL0 to lock
+   wait for PLL0 to lock
-       connect PLL0
+   connect PLL0
-       done
+   done
-     */
+ */
-    enableMainOsc();
+  enableMainOsc();
-    setClkSrc( CLKSRC_MAINOSC );
+  setClkSrc(CLKSRC_MAINOSC);
-    setPLL0MultPrediv( 22, 1 );
+// XXX  setPLL0MultPrediv(429, 19);
-    enablePLL0();
+// XXX  setPLL0MultPrediv(23, 2);
-    setCCLKDiv( 6 );
+  setPLL0MultPrediv(12, 1);
-    connectPLL0();
+  enablePLL0();
+  setCCLKDiv(3);
+  connectPLL0();
 }
 
-void setFlashAccessTime( uint8_t clocks )
+void setFlashAccessTime(uint8_t clocks) {
-{
+  LPC_SC->FLASHCFG=FLASHTIM(clocks);
-    LPC_SC->FLASHCFG = FLASHTIM( clocks );
 }
 
-void setPLL0MultPrediv( uint16_t mult, uint8_t prediv )
+void setPLL0MultPrediv(uint16_t mult, uint8_t prediv) {
-{
+  LPC_SC->PLL0CFG=PLL_MULT(mult) | PLL_PREDIV(prediv);
-    LPC_SC->PLL0CFG = PLL_MULT( mult ) | PLL_PREDIV( prediv );
+  PLL0feed();
-    PLL0feed();
 }
 
-void enablePLL0()
+void enablePLL0() {
-{
+  LPC_SC->PLL0CON |= PLLE0;
-    LPC_SC->PLL0CON |= PLLE0;
+  PLL0feed();
-    PLL0feed();
 }
 
-void disablePLL0()
+void disablePLL0() {
-{
+  LPC_SC->PLL0CON &= ~PLLE0;
-    LPC_SC->PLL0CON &= ~PLLE0;
+  PLL0feed();
-    PLL0feed();
 }
 
-void connectPLL0()
+void connectPLL0() {
-{
+  while(!(LPC_SC->PLL0STAT&PLOCK0));
-    while ( !( LPC_SC->PLL0STAT & PLOCK0 ) );
+  LPC_SC->PLL0CON |= PLLC0;
-
+  PLL0feed();
-    LPC_SC->PLL0CON |= PLLC0;
-    PLL0feed();
 }
 
-void disconnectPLL0()
+void disconnectPLL0() {
-{
+  LPC_SC->PLL0CON &= ~PLLC0;
-    LPC_SC->PLL0CON &= ~PLLC0;
+  PLL0feed();
-    PLL0feed();
 }
 
-void setCCLKDiv( uint8_t div )
+void setCCLKDiv(uint8_t div) {
-{
+  LPC_SC->CCLKCFG=CCLK_DIV(div);
-    LPC_SC->CCLKCFG = CCLK_DIV( div );
 }
 
-void enableMainOsc()
+void enableMainOsc() {
-{
+  LPC_SC->SCS=OSCEN;
-    LPC_SC->SCS = OSCEN;
+  while(!(LPC_SC->SCS&OSCSTAT));
-
-    while ( !( LPC_SC->SCS & OSCSTAT ) );
 }
 
-void disableMainOsc()
+void disableMainOsc() {
-{
+  LPC_SC->SCS=0;
-    LPC_SC->SCS = 0;
 }
 
-void PLL0feed()
+void PLL0feed() {
-{
+  LPC_SC->PLL0FEED=0xaa;
-    LPC_SC->PLL0FEED = 0xaa;
+  LPC_SC->PLL0FEED=0x55;
-    LPC_SC->PLL0FEED = 0x55;
 }
 
-void setClkSrc( uint8_t src )
+void setClkSrc(uint8_t src) {
-{
+  LPC_SC->CLKSRCSEL=src;
-    LPC_SC->CLKSRCSEL = src;
 }

src/clock.h

@@ -18,60 +18,62 @@
 #define PCLK_CCLK2(x)   (2<<(x))
 
 /* shift values for use with PCLKSEL0 */
-#define PCLK_WDT    (0)
+#define PCLK_WDT	(0)
-#define PCLK_TIMER0 (2)
+#define PCLK_TIMER0	(2)
-#define PCLK_TIMER1 (4)
+#define PCLK_TIMER1	(4)
-#define PCLK_UART0  (6)
+#define PCLK_UART0	(6)
-#define PCLK_UART1  (8)
+#define PCLK_UART1	(8)
-#define PCLK_PWM1   (12)
+#define PCLK_PWM1	(12)
-#define PCLK_I2C0   (14)
+#define PCLK_I2C0	(14)
-#define PCLK_SPI    (16)
+#define PCLK_SPI	(16)
-#define PCLK_SSP1   (20)
+#define PCLK_SSP1	(20)
-#define PCLK_DAC    (22)
+#define PCLK_DAC	(22)
-#define PCLK_ADC    (24)
+#define PCLK_ADC	(24)
-#define PCLK_CAN1   (26)
+#define PCLK_CAN1	(26)
-#define PCLK_CAN2   (28)
+#define PCLK_CAN2	(28)
-#define PCLK_ACF    (30)
+#define PCLK_ACF	(30)
 
 /* shift values for use with PCLKSEL1 */
-#define PCLK_QEI    (0)
+#define PCLK_QEI	(0)
-#define PCLK_GPIOINT    (2)
+#define PCLK_GPIOINT	(2)
-#define PCLK_PCB    (4)
+#define PCLK_PCB	(4)
-#define PCLK_I2C1   (6)
+#define PCLK_I2C1	(6)
-#define PCLK_SSP0   (10)
+#define PCLK_SSP0	(10)
-#define PCLK_TIMER2 (12)
+#define PCLK_TIMER2	(12)
 #define PCLK_TIMER3     (14)
-#define PCLK_UART2  (16)
+#define PCLK_UART2	(16)
-#define PCLK_UART3  (18)
+#define PCLK_UART3	(18)
-#define PCLK_I2C2   (20)
+#define PCLK_I2C2	(20)
-#define PCLK_I2S    (22)
+#define PCLK_I2S	(22)
-#define PCLK_RIT    (26)
+#define PCLK_RIT	(26)
-#define PCLK_SYSCON (28)
+#define PCLK_SYSCON	(28)
-#define PCLK_MC     (30)
+#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 setClkSrc(uint8_t src);
 
-void PLL0feed( void );
 
-void setClkSrc( uint8_t src );
 #endif

src/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 TODAY\n" \
     "#ifndef AUTOCONF_H\n" \
     "#define AUTOCONF_H"
 }

src/config

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

src/config.h

@@ -11,9 +11,9 @@
 #define IN_AHBRAM                 __attribute__ ((section(".ahbram")))
 
 #define SD_DT_INT_SETUP()         do {\
-        BITBAND(LPC_GPIOINT->IO2IntEnR, SD_DT_BIT) = 1;\
+                                    BITBAND(LPC_GPIOINT->IO2IntEnR, SD_DT_BIT) = 1;\
-        BITBAND(LPC_GPIOINT->IO2IntEnF, SD_DT_BIT) = 1;\
+                                    BITBAND(LPC_GPIOINT->IO2IntEnF, SD_DT_BIT) = 1;\
-    } while(0)
+                                  } while(0)
 
 #define SD_CHANGE_DETECT          (BITBAND(LPC_GPIOINT->IO2IntStatR, SD_DT_BIT)\
                                    |BITBAND(LPC_GPIOINT->IO2IntStatF, SD_DT_BIT))
@@ -33,9 +33,9 @@
 // #define SD_CHANGE_VECT
 // #define CONFIG_SD_DATACRC 1
 
-#define CONFIG_UART_NUM           3
+#define CONFIG_UART_NUM	          3
 // #define CONFIG_CPU_FREQUENCY      90315789
-#define CONFIG_CPU_FREQUENCY      88000000
+#define CONFIG_CPU_FREQUENCY      96000000
 //#define CONFIG_CPU_FREQUENCY      46000000
 #define CONFIG_UART_PCLKDIV       1
 #define CONFIG_UART_TX_BUF_SHIFT  8
@@ -43,7 +43,11 @@
 #define CONFIG_UART_BAUDRATE      115200
 #define CONFIG_UART_DEADLOCKABLE
 
-#define SSP_CLK_DIVISOR           2
+#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 SNES_RESET_REG            LPC_GPIO1
 #define SNES_RESET_BIT            26
@@ -64,11 +68,7 @@
 #define FPGA_MCU_RDY_BIT          9
 
 #define QSORT_MAXELEM             2048
-#define SORT_STRLEN               256
+#define CLTBL_SIZE		  100
-#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 );
+uint8_t crc7update(uint8_t crc, uint8_t data);
-uint16_t crc_xmodem_update( uint16_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 );
+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,8 +20,7 @@
 /**
  * Static table used for the table_driven implementation.
  *****************************************************************************/
-static const uint16_t crc_table[256] =
+static const uint16_t crc_table[256] = {
-{
     0x0000, 0xc0c1, 0xc181, 0x0140, 0xc301, 0x03c0, 0x0280, 0xc241,
     0xc601, 0x06c0, 0x0780, 0xc741, 0x0500, 0xc5c1, 0xc481, 0x0440,
     0xcc01, 0x0cc0, 0x0d80, 0xcd41, 0x0f00, 0xcfc1, 0xce81, 0x0e40,
@@ -64,12 +63,12 @@ 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;
+  unsigned int tbl_idx;
-    tbl_idx = ( crc ^ data ) & 0xff;
+  tbl_idx = (crc ^ data) & 0xff;
-    crc = ( crc_table[tbl_idx] ^ ( crc >> 8 ) ) & 0xffff;
+  crc = (crc_table[tbl_idx] ^ (crc >> 8)) & 0xffff;
-    return crc & 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,72 +22,71 @@
 /**
  * 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,
-    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
+  0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
-    0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
+  0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
-    0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+  0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
-    0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
+  0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
-    0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+  0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
-    0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+  0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
-    0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
+  0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
-    0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
+  0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
-    0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+  0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
-    0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+  0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940,
-    0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940,
+  0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
-    0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+  0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116,
-    0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116,
+  0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
-    0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
+  0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
-    0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+  0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
-    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
+  0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a,
-    0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a,
+  0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
-    0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+  0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
-    0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
+  0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
-    0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+  0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
-    0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+  0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
-    0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
+  0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c,
-    0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c,
+  0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
-    0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+  0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
-    0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+  0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
-    0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
+  0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
-    0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+  0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
-    0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
+  0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
-    0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
+  0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
-    0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+  0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4,
-    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4,
+  0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
-    0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
+  0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
-    0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+  0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
-    0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
+  0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
-    0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+  0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
-    0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+  0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe,
-    0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe,
+  0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
-    0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
+  0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
-    0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+  0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
-    0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+  0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252,
-    0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252,
+  0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
-    0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+  0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60,
-    0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60,
+  0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
-    0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
+  0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
-    0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+  0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
-    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
+  0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04,
-    0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04,
+  0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
-    0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+  0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
-    0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
+  0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
-    0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+  0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
-    0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+  0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
-    0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
+  0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e,
-    0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e,
+  0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
-    0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+  0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
-    0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+  0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
-    0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
+  0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
-    0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+  0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
-    0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
+  0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
-    0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
+  0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
-    0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+  0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6,
-    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6,
+  0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
-    0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
+  0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
-    0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+  0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
-    0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
 };
 
 /**
@@ -98,14 +97,14 @@ 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;
+  unsigned int tbl_idx;
 
-    tbl_idx = ( crc ^ data ) & 0xff;
+  tbl_idx = (crc ^ data) & 0xff;
-    crc = ( crc32_table[tbl_idx] ^ ( crc >> 8 ) ) & 0xffffffff;
+  crc = (crc32_table[tbl_idx] ^ (crc >> 8)) & 0xffffffff;
 
-    return crc & 0xffffffff;
+  return crc & 0xffffffff;
 }
 
 

src/crc32.h

@@ -34,9 +34,9 @@ extern "C" {
  *
  * \return     The initial crc value.
  *****************************************************************************/
-static inline uint32_t crc_init( void )
+static inline uint32_t crc_init(void)
 {
-    return 0xffffffff;
+  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,9 +55,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 crc32_finalize( uint32_t crc )
+static inline uint32_t crc32_finalize(uint32_t crc)
 {
-    return crc ^ 0xffffffff;
+  return crc ^ 0xffffffff;
 }
 
 

src/diskio.h

@@ -4,8 +4,8 @@
 
 #ifndef _DISKIO
 
-#define _READONLY   0   /* 1: Remove write functions */
+#define _READONLY	0	/* 1: Remove write functions */
-#define _USE_IOCTL  1   /* 1: Use disk_ioctl fucntion */
+#define _USE_IOCTL	1	/* 1: Use disk_ioctl fucntion */
 
 #include <arm/NXP/LPC17xx/LPC17xx.h>
 
@@ -13,16 +13,15 @@
 
 
 /* Status of Disk Functions */
-typedef BYTE    DSTATUS;
+typedef BYTE	DSTATUS;
 
 /* Results of Disk Functions */
-typedef enum
+typedef enum {
-{
+	RES_OK = 0,		/* 0: Successful */
-    RES_OK = 0,     /* 0: Successful */
+	RES_ERROR,		/* 1: R/W Error */
-    RES_ERROR,      /* 1: R/W Error */
+	RES_WRPRT,		/* 2: Write Protected */
-    RES_WRPRT,      /* 2: Write Protected */
+	RES_NOTRDY,		/* 3: Not Ready */
-    RES_NOTRDY,     /* 3: Not Ready */
+	RES_PARERR		/* 4: Invalid Parameter */
-    RES_PARERR      /* 4: Invalid Parameter */
 } DRESULT;
 
 /**
@@ -36,13 +35,12 @@ 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  validbytes;
+  uint8_t  maxpage;
-    uint8_t  maxpage;
+  uint8_t  disktype;
-    uint8_t  disktype;
+  uint8_t  sectorsize;   /* divided by 256 */
-    uint8_t  sectorsize;   /* divided by 256 */
+  uint32_t sectorcount;  /* 2 TB should be enough... (512 byte sectors) */
-    uint32_t sectorcount;  /* 2 TB should be enough... (512 byte sectors) */
 } diskinfo0_t;
 
 
@@ -50,16 +48,16 @@ typedef struct
 /*---------------------------------------*/
 /* Prototypes for disk control functions */
 
-int assign_drives ( int, int );
+int assign_drives (int, int);
-DSTATUS disk_initialize ( BYTE );
+DSTATUS disk_initialize (BYTE);
-DSTATUS disk_status ( BYTE );
+DSTATUS disk_status (BYTE);
-DRESULT disk_read ( BYTE, BYTE *, DWORD, BYTE );
+DRESULT disk_read (BYTE, BYTE*, DWORD, BYTE);
-#if _READONLY == 0
+#if	_READONLY == 0
-DRESULT disk_write ( BYTE, const BYTE *, DWORD, BYTE );
+DRESULT disk_write (BYTE, const BYTE*, DWORD, BYTE);
 #endif
-DRESULT disk_ioctl ( BYTE, BYTE, void * );
+#define disk_ioctl(a,b,c) RES_OK
 
-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 };
@@ -81,39 +79,39 @@ extern volatile enum diskstates disk_state;
 
 /* Disk Status Bits (DSTATUS) */
 
-#define STA_NOINIT      0x01    /* Drive not initialized */
+#define STA_NOINIT		0x01	/* Drive not initialized */
-#define STA_NODISK      0x02    /* No medium in the drive */
+#define STA_NODISK		0x02	/* No medium in the drive */
-#define STA_PROTECT     0x04    /* Write protected */
+#define STA_PROTECT		0x04	/* Write protected */
 
 
 /* Command code for disk_ioctrl fucntion */
 
 /* Generic command (defined for FatFs) */
-#define CTRL_SYNC           0   /* Flush disk cache (for write functions) */
+#define CTRL_SYNC			0	/* Flush disk cache (for write functions) */
-#define GET_SECTOR_COUNT    1   /* Get media size (for only f_mkfs()) */
+#define GET_SECTOR_COUNT	1	/* Get media size (for only f_mkfs()) */
-#define GET_SECTOR_SIZE     2   /* Get sector size (for multiple sector size (_MAX_SS >= 1024)) */
+#define GET_SECTOR_SIZE		2	/* Get sector size (for multiple sector size (_MAX_SS >= 1024)) */
-#define GET_BLOCK_SIZE      3   /* Get erase block size (for only f_mkfs()) */
+#define GET_BLOCK_SIZE		3	/* Get erase block size (for only f_mkfs()) */
-#define CTRL_ERASE_SECTOR   4   /* Force erased a block of sectors (for only _USE_ERASE) */
+#define CTRL_ERASE_SECTOR	4	/* Force erased a block of sectors (for only _USE_ERASE) */
 
 /* Generic command */
-#define CTRL_POWER          5   /* Get/Set power status */
+#define CTRL_POWER			5	/* Get/Set power status */
-#define CTRL_LOCK           6   /* Lock/Unlock media removal */
+#define CTRL_LOCK			6	/* Lock/Unlock media removal */
-#define CTRL_EJECT          7   /* Eject media */
+#define CTRL_EJECT			7	/* Eject media */
 
 /* MMC/SDC specific ioctl command */
-#define MMC_GET_TYPE        10  /* Get card type */
+#define MMC_GET_TYPE		10	/* Get card type */
-#define MMC_GET_CSD         11  /* Get CSD */
+#define MMC_GET_CSD			11	/* Get CSD */
-#define MMC_GET_CID         12  /* Get CID */
+#define MMC_GET_CID			12	/* Get CID */
-#define MMC_GET_OCR         13  /* Get OCR */
+#define MMC_GET_OCR			13	/* Get OCR */
-#define MMC_GET_SDSTAT      14  /* Get SD status */
+#define MMC_GET_SDSTAT		14	/* Get SD status */
 
 /* ATA/CF specific ioctl command */
-#define ATA_GET_REV         20  /* Get F/W revision */
+#define ATA_GET_REV			20	/* Get F/W revision */
-#define ATA_GET_MODEL       21  /* Get model name */
+#define ATA_GET_MODEL		21	/* Get model name */
-#define ATA_GET_SN          22  /* Get serial number */
+#define ATA_GET_SN			22	/* Get serial number */
 
 /* NAND specific ioctl command */
-#define NAND_FORMAT         30  /* Create physical format */
+#define NAND_FORMAT			30	/* Create physical format */
 
 
 #define _DISKIO

src/faulthandler.c

@@ -1,25 +1,20 @@
 #include <arm/NXP/LPC17xx/LPC17xx.h>
 #include "uart.h"
 
-void HardFault_Handler( void )
+void HardFault_Handler(void) {
-{
+  printf("HFSR: %lx\n", SCB->HFSR);
-    printf( "HFSR: %lx\n", SCB->HFSR );
+  while (1) ;
-
-    while ( 1 ) ;
 }
 
-void MemManage_Handler( void )
+void MemManage_Handler(void) {
-{
+  printf("MemManage - CFSR: %lx; MMFAR: %lx\n", SCB->CFSR, SCB->MMFAR);
-    printf( "MemManage - CFSR: %lx; MMFAR: %lx\n", SCB->CFSR, SCB->MMFAR );
 }
 
-void BusFault_Handler( void )
+void BusFault_Handler(void) {
-{
+  printf("BusFault - CFSR: %lx; BFAR: %lx\n", SCB->CFSR, SCB->BFAR);
-    printf( "BusFault - CFSR: %lx; BFAR: %lx\n", SCB->CFSR, SCB->BFAR );
 }
 
-void UsageFault_Handler( void )
+void UsageFault_Handler(void) {
-{
+  printf("UsageFault - CFSR: %lx; BFAR: %lx\n", SCB->CFSR, SCB->BFAR);
-    printf( "UsageFault - CFSR: %lx; BFAR: %lx\n", SCB->CFSR, SCB->BFAR );
 }
 

src/ff.h

@@ -15,14 +15,14 @@
 /----------------------------------------------------------------------------*/
 
 #ifndef _FATFS
-#define _FATFS  8255    /* Revision ID */
+#define _FATFS	8255	/* Revision ID */
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "integer.h"    /* Basic integer types */
+#include "integer.h"	/* Basic integer types */
-#include "ffconf.h"     /* FatFs configuration options */
+#include "ffconf.h"		/* FatFs configuration options */
 
 #if _FATFS != _FFCONF
 #error Wrong configuration file (ffconf.h).
@@ -31,191 +31,191 @@ extern "C" {
 
 /* DBCS code ranges and SBCS extend char conversion table */
 
-#if _CODE_PAGE == 932   /* Japanese Shift-JIS */
+#if _CODE_PAGE == 932	/* Japanese Shift-JIS */
-#define _DF1S   0x81    /* DBC 1st byte range 1 start */
+#define _DF1S	0x81	/* DBC 1st byte range 1 start */
-#define _DF1E   0x9F    /* DBC 1st byte range 1 end */
+#define _DF1E	0x9F	/* DBC 1st byte range 1 end */
-#define _DF2S   0xE0    /* DBC 1st byte range 2 start */
+#define _DF2S	0xE0	/* DBC 1st byte range 2 start */
-#define _DF2E   0xFC    /* DBC 1st byte range 2 end */
+#define _DF2E	0xFC	/* DBC 1st byte range 2 end */
-#define _DS1S   0x40    /* DBC 2nd byte range 1 start */
+#define _DS1S	0x40	/* DBC 2nd byte range 1 start */
-#define _DS1E   0x7E    /* DBC 2nd byte range 1 end */
+#define _DS1E	0x7E	/* DBC 2nd byte range 1 end */
-#define _DS2S   0x80    /* DBC 2nd byte range 2 start */
+#define _DS2S	0x80	/* DBC 2nd byte range 2 start */
-#define _DS2E   0xFC    /* DBC 2nd byte range 2 end */
+#define _DS2E	0xFC	/* DBC 2nd byte range 2 end */
 
-#elif _CODE_PAGE == 936 /* Simplified Chinese GBK */
+#elif _CODE_PAGE == 936	/* Simplified Chinese GBK */
-#define _DF1S   0x81
+#define _DF1S	0x81
-#define _DF1E   0xFE
+#define _DF1E	0xFE
-#define _DS1S   0x40
+#define _DS1S	0x40
-#define _DS1E   0x7E
+#define _DS1E	0x7E
-#define _DS2S   0x80
+#define _DS2S	0x80
-#define _DS2E   0xFE
+#define _DS2E	0xFE
 
-#elif _CODE_PAGE == 949 /* Korean */
+#elif _CODE_PAGE == 949	/* Korean */
-#define _DF1S   0x81
+#define _DF1S	0x81
-#define _DF1E   0xFE
+#define _DF1E	0xFE
-#define _DS1S   0x41
+#define _DS1S	0x41
-#define _DS1E   0x5A
+#define _DS1E	0x5A
-#define _DS2S   0x61
+#define _DS2S	0x61
-#define _DS2E   0x7A
+#define _DS2E	0x7A
-#define _DS3S   0x81
+#define _DS3S	0x81
-#define _DS3E   0xFE
+#define _DS3E	0xFE
 
-#elif _CODE_PAGE == 950 /* Traditional Chinese Big5 */
+#elif _CODE_PAGE == 950	/* Traditional Chinese Big5 */
-#define _DF1S   0x81
+#define _DF1S	0x81
-#define _DF1E   0xFE
+#define _DF1E	0xFE
-#define _DS1S   0x40
+#define _DS1S	0x40
-#define _DS1E   0x7E
+#define _DS1E	0x7E
-#define _DS2S   0xA1
+#define _DS2S	0xA1
-#define _DS2E   0xFE
+#define _DS2E	0xFE
 
-#elif _CODE_PAGE == 437 /* U.S. (OEM) */
+#elif _CODE_PAGE == 437	/* U.S. (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x9A,0x90,0x41,0x8E,0x41,0x8F,0x80,0x45,0x45,0x45,0x49,0x49,0x49,0x8E,0x8F,0x90,0x92,0x92,0x4F,0x99,0x4F,0x55,0x55,0x59,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-        0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
-#elif _CODE_PAGE == 720 /* Arabic (OEM) */
+#elif _CODE_PAGE == 720	/* Arabic (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x45,0x41,0x84,0x41,0x86,0x43,0x45,0x45,0x45,0x49,0x49,0x8D,0x8E,0x8F,0x90,0x92,0x92,0x93,0x94,0x95,0x49,0x49,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-        0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
-#elif _CODE_PAGE == 737 /* Greek (OEM) */
+#elif _CODE_PAGE == 737	/* Greek (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x92,0x92,0x93,0x94,0x95,0x96,0x97,0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87, \
-        0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0xAA,0x92,0x93,0x94,0x95,0x96,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0xAA,0x92,0x93,0x94,0x95,0x96,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0x97,0xEA,0xEB,0xEC,0xE4,0xED,0xEE,0xE7,0xE8,0xF1,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0x97,0xEA,0xEB,0xEC,0xE4,0xED,0xEE,0xE7,0xE8,0xF1,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
-#elif _CODE_PAGE == 775 /* Baltic (OEM) */
+#elif _CODE_PAGE == 775	/* Baltic (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x9A,0x91,0xA0,0x8E,0x95,0x8F,0x80,0xAD,0xED,0x8A,0x8A,0xA1,0x8D,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0x95,0x96,0x97,0x97,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \
-        0xA0,0xA1,0xE0,0xA3,0xA3,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xA0,0xA1,0xE0,0xA3,0xA3,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xB5,0xB6,0xB7,0xB8,0xBD,0xBE,0xC6,0xC7,0xA5,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xB5,0xB6,0xB7,0xB8,0xBD,0xBE,0xC6,0xC7,0xA5,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE3,0xE8,0xE8,0xEA,0xEA,0xEE,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE3,0xE8,0xE8,0xEA,0xEA,0xEE,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
-#elif _CODE_PAGE == 850 /* Multilingual Latin 1 (OEM) */
+#elif _CODE_PAGE == 850	/* Multilingual Latin 1 (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0xDE,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x59,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \
-        0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE7,0xE9,0xEA,0xEB,0xED,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE7,0xE9,0xEA,0xEB,0xED,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
-#elif _CODE_PAGE == 852 /* Latin 2 (OEM) */
+#elif _CODE_PAGE == 852	/* Latin 2 (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xDE,0x8F,0x80,0x9D,0xD3,0x8A,0x8A,0xD7,0x8D,0x8E,0x8F,0x90,0x91,0x91,0xE2,0x99,0x95,0x95,0x97,0x97,0x99,0x9A,0x9B,0x9B,0x9D,0x9E,0x9F, \
-        0xB5,0xD6,0xE0,0xE9,0xA4,0xA4,0xA6,0xA6,0xA8,0xA8,0xAA,0x8D,0xAC,0xB8,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBD,0xBF, \
+				0xB5,0xD6,0xE0,0xE9,0xA4,0xA4,0xA6,0xA6,0xA8,0xA8,0xAA,0x8D,0xAC,0xB8,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBD,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC6,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD2,0xD3,0xD2,0xD5,0xD6,0xD7,0xB7,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC6,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD2,0xD3,0xD2,0xD5,0xD6,0xD7,0xB7,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xE0,0xE1,0xE2,0xE3,0xE3,0xD5,0xE6,0xE6,0xE8,0xE9,0xE8,0xEB,0xED,0xED,0xDD,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xEB,0xFC,0xFC,0xFE,0xFF}
+				0xE0,0xE1,0xE2,0xE3,0xE3,0xD5,0xE6,0xE6,0xE8,0xE9,0xE8,0xEB,0xED,0xED,0xDD,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xEB,0xFC,0xFC,0xFE,0xFF}
 
-#elif _CODE_PAGE == 855 /* Cyrillic (OEM) */
+#elif _CODE_PAGE == 855	/* Cyrillic (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x81,0x81,0x83,0x83,0x85,0x85,0x87,0x87,0x89,0x89,0x8B,0x8B,0x8D,0x8D,0x8F,0x8F,0x91,0x91,0x93,0x93,0x95,0x95,0x97,0x97,0x99,0x99,0x9B,0x9B,0x9D,0x9D,0x9F,0x9F, \
-        0xA1,0xA1,0xA3,0xA3,0xA5,0xA5,0xA7,0xA7,0xA9,0xA9,0xAB,0xAB,0xAD,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB6,0xB6,0xB8,0xB8,0xB9,0xBA,0xBB,0xBC,0xBE,0xBE,0xBF, \
+				0xA1,0xA1,0xA3,0xA3,0xA5,0xA5,0xA7,0xA7,0xA9,0xA9,0xAB,0xAB,0xAD,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB6,0xB6,0xB8,0xB8,0xB9,0xBA,0xBB,0xBC,0xBE,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD3,0xD3,0xD5,0xD5,0xD7,0xD7,0xDD,0xD9,0xDA,0xDB,0xDC,0xDD,0xE0,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD3,0xD3,0xD5,0xD5,0xD7,0xD7,0xDD,0xD9,0xDA,0xDB,0xDC,0xDD,0xE0,0xDF, \
-        0xE0,0xE2,0xE2,0xE4,0xE4,0xE6,0xE6,0xE8,0xE8,0xEA,0xEA,0xEC,0xEC,0xEE,0xEE,0xEF,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF8,0xFA,0xFA,0xFC,0xFC,0xFD,0xFE,0xFF}
+				0xE0,0xE2,0xE2,0xE4,0xE4,0xE6,0xE6,0xE8,0xE8,0xEA,0xEA,0xEC,0xEC,0xEE,0xEE,0xEF,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF8,0xFA,0xFA,0xFC,0xFC,0xFD,0xFE,0xFF}
 
-#elif _CODE_PAGE == 857 /* Turkish (OEM) */
+#elif _CODE_PAGE == 857	/* Turkish (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0x98,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x98,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9E, \
-        0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA6,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA6,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xDE,0x59,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xDE,0x59,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
-#elif _CODE_PAGE == 858 /* Multilingual Latin 1 + Euro (OEM) */
+#elif _CODE_PAGE == 858	/* Multilingual Latin 1 + Euro (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0xDE,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x59,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \
-        0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE7,0xE9,0xEA,0xEB,0xED,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE7,0xE9,0xEA,0xEB,0xED,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
-#elif _CODE_PAGE == 862 /* Hebrew (OEM) */
+#elif _CODE_PAGE == 862	/* Hebrew (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-        0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
-#elif _CODE_PAGE == 866 /* Russian (OEM) */
+#elif _CODE_PAGE == 866	/* Russian (OEM) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-        0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0x90,0x91,0x92,0x93,0x9d,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,0xF0,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0x90,0x91,0x92,0x93,0x9d,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,0xF0,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
-#elif _CODE_PAGE == 874 /* Thai (OEM, Windows) */
+#elif _CODE_PAGE == 874	/* Thai (OEM, Windows) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-        0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
 #elif _CODE_PAGE == 1250 /* Central Europe (Windows) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8A,0x9B,0x8C,0x8D,0x8E,0x8F, \
-        0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xA3,0xB4,0xB5,0xB6,0xB7,0xB8,0xA5,0xAA,0xBB,0xBC,0xBD,0xBC,0xAF, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xA3,0xB4,0xB5,0xB6,0xB7,0xB8,0xA5,0xAA,0xBB,0xBC,0xBD,0xBC,0xAF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF}
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF}
 
 #elif _CODE_PAGE == 1251 /* Cyrillic (Windows) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x82,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x80,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8A,0x9B,0x8C,0x8D,0x8E,0x8F, \
-        0xA0,0xA2,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB2,0xA5,0xB5,0xB6,0xB7,0xA8,0xB9,0xAA,0xBB,0xA3,0xBD,0xBD,0xAF, \
+				0xA0,0xA2,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB2,0xA5,0xB5,0xB6,0xB7,0xA8,0xB9,0xAA,0xBB,0xA3,0xBD,0xBD,0xAF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF}
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF}
 
 #elif _CODE_PAGE == 1252 /* Latin 1 (Windows) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0xAd,0x9B,0x8C,0x9D,0xAE,0x9F, \
-        0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0x9F}
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0x9F}
 
 #elif _CODE_PAGE == 1253 /* Greek (Windows) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-        0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xA2,0xB8,0xB9,0xBA, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xA2,0xB8,0xB9,0xBA, \
-        0xE0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xF2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xFB,0xBC,0xFD,0xBF,0xFF}
+				0xE0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xF2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xFB,0xBC,0xFD,0xBF,0xFF}
 
 #elif _CODE_PAGE == 1254 /* Turkish (Windows) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8A,0x9B,0x8C,0x9D,0x9E,0x9F, \
-        0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0x9F}
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0x9F}
 
 #elif _CODE_PAGE == 1255 /* Hebrew (Windows) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-        0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
 
 #elif _CODE_PAGE == 1256 /* Arabic (Windows) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x8C,0x9D,0x9E,0x9F, \
-        0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0x41,0xE1,0x41,0xE3,0xE4,0xE5,0xE6,0x43,0x45,0x45,0x45,0x45,0xEC,0xED,0x49,0x49,0xF0,0xF1,0xF2,0xF3,0x4F,0xF5,0xF6,0xF7,0xF8,0x55,0xFA,0x55,0x55,0xFD,0xFE,0xFF}
+				0x41,0xE1,0x41,0xE3,0xE4,0xE5,0xE6,0x43,0x45,0x45,0x45,0x45,0xEC,0xED,0x49,0x49,0xF0,0xF1,0xF2,0xF3,0x4F,0xF5,0xF6,0xF7,0xF8,0x55,0xFA,0x55,0x55,0xFD,0xFE,0xFF}
 
 #elif _CODE_PAGE == 1257 /* Baltic (Windows) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-        0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xA8,0xB9,0xAA,0xBB,0xBC,0xBD,0xBE,0xAF, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xA8,0xB9,0xAA,0xBB,0xBC,0xBD,0xBE,0xAF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF}
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF}
 
 #elif _CODE_PAGE == 1258 /* Vietnam (OEM, Windows) */
-#define _DF1S   0
+#define _DF1S	0
 #define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0xAC,0x9D,0x9E,0x9F, \
-        0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-        0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xEC,0xCD,0xCE,0xCF,0xD0,0xD1,0xF2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xFE,0x9F}
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xEC,0xCD,0xCE,0xCF,0xD0,0xD1,0xF2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xFE,0x9F}
 
-#elif _CODE_PAGE == 1   /* ASCII (for only non-LFN cfg) */
+#elif _CODE_PAGE == 1	/* ASCII (for only non-LFN cfg) */
-#define _DF1S   0
+#define _DF1S	0
 
 #else
 #error Unknown code page
@@ -226,19 +226,18 @@ extern "C" {
 
 /* Definitions of volume management */
 
-#if _MULTI_PARTITION        /* Multiple partition configuration */
+#if _MULTI_PARTITION		/* Multiple partition configuration */
-#define LD2PD(vol) (VolToPart[vol].pd)  /* Get physical drive# */
+#define LD2PD(vol) (VolToPart[vol].pd)	/* Get physical drive# */
-#define LD2PT(vol) (VolToPart[vol].pt)  /* Get partition# */
+#define LD2PT(vol) (VolToPart[vol].pt)	/* Get partition# */
-typedef struct
+typedef struct {
-{
+	BYTE pd;	/* Physical drive# */
-    BYTE pd;    /* Physical drive# */
+	BYTE pt;	/* Partition # (0-3) */
-    BYTE pt;    /* Partition # (0-3) */
 } PARTITION;
-extern const PARTITION VolToPart[]; /* Volume - Physical location resolution table */
+extern const PARTITION VolToPart[];	/* Volume - Physical location resolution table */
 
-#else                       /* Single partition configuration */
+#else						/* Single partition configuration */
-#define LD2PD(vol) (vol)    /* Logical drive# is bound to the same physical drive# */
+#define LD2PD(vol) (vol)	/* Logical drive# is bound to the same physical drive# */
-#define LD2PT(vol) 0        /* Always mounts the 1st partition */
+#define LD2PT(vol) 0		/* Always mounts the 1st partition */
 
 #endif
 
@@ -246,7 +245,7 @@ extern const PARTITION VolToPart[]; /* Volume - Physical location resolution tab
 
 /* Type of path name strings on FatFs API */
 
-#if _LFN_UNICODE            /* Unicode string */
+#if _LFN_UNICODE			/* Unicode string */
 #if !_USE_LFN
 #error _LFN_UNICODE must be 0 in non-LFN cfg.
 #endif
@@ -256,7 +255,7 @@ typedef WCHAR TCHAR;
 #define _TEXT(x) L ## x
 #endif
 
-#else                       /* ANSI/OEM string */
+#else						/* ANSI/OEM string */
 #ifndef _INC_TCHAR
 typedef char TCHAR;
 #define _T(x) x
@@ -269,66 +268,64 @@ typedef char TCHAR;
 
 /* File system object structure (FATFS) */
 
-typedef struct
+typedef struct {
-{
+	BYTE	fs_type;		/* FAT sub-type (0:Not mounted) */
-    BYTE    fs_type;        /* FAT sub-type (0:Not mounted) */
+	BYTE	drv;			/* Physical drive number */
-    BYTE    drv;            /* Physical drive number */
+	BYTE	csize;			/* Sectors per cluster (1,2,4...128) */
-    BYTE    csize;          /* Sectors per cluster (1,2,4...128) */
+	BYTE	n_fats;			/* Number of FAT copies (1,2) */
-    BYTE    n_fats;         /* Number of FAT copies (1,2) */
+	BYTE	wflag;			/* win[] dirty flag (1:must be written back) */
-    BYTE    wflag;          /* win[] dirty flag (1:must be written back) */
+	BYTE	fsi_flag;		/* fsinfo dirty flag (1:must be written back) */
-    BYTE    fsi_flag;       /* fsinfo dirty flag (1:must be written back) */
+	WORD	id;				/* File system mount ID */
-    WORD    id;             /* File system mount ID */
+	WORD	n_rootdir;		/* Number of root directory entries (FAT12/16) */
-    WORD    n_rootdir;      /* Number of root directory entries (FAT12/16) */
 #if _MAX_SS != 512
-    WORD    ssize;          /* Bytes per sector (512,1024,2048,4096) */
+	WORD	ssize;			/* Bytes per sector (512,1024,2048,4096) */
 #endif
 #if _FS_REENTRANT
-    _SYNC_t sobj;           /* Identifier of sync object */
+	_SYNC_t	sobj;			/* Identifier of sync object */
 #endif
 #if !_FS_READONLY
-    DWORD   last_clust;     /* Last allocated cluster */
+	DWORD	last_clust;		/* Last allocated cluster */
-    DWORD   free_clust;     /* Number of free clusters */
+	DWORD	free_clust;		/* Number of free clusters */
-    DWORD   fsi_sector;     /* fsinfo sector (FAT32) */
+	DWORD	fsi_sector;		/* fsinfo sector (FAT32) */
 #endif
 #if _FS_RPATH
-    DWORD   cdir;           /* Current directory start cluster (0:root) */
+	DWORD	cdir;			/* Current directory start cluster (0:root) */
 #endif
-    DWORD   n_fatent;       /* Number of FAT entries (= number of clusters + 2) */
+	DWORD	n_fatent;		/* Number of FAT entries (= number of clusters + 2) */
-    DWORD   fsize;          /* Sectors per FAT */
+	DWORD	fsize;			/* Sectors per FAT */
-    DWORD   fatbase;        /* FAT start sector */
+	DWORD	fatbase;		/* FAT start sector */
-    DWORD   dirbase;        /* Root directory start sector (FAT32:Cluster#) */
+	DWORD	dirbase;		/* Root directory start sector (FAT32:Cluster#) */
-    DWORD   database;       /* Data start sector */
+	DWORD	database;		/* Data start sector */
-    DWORD   winsect;        /* Current sector appearing in the win[] */
+	DWORD	winsect;		/* Current sector appearing in the win[] */
-    BYTE    win[_MAX_SS];   /* Disk access window for Directory, FAT (and Data on tiny cfg) */
+	BYTE	win[_MAX_SS];	/* Disk access window for Directory, FAT (and Data on tiny cfg) */
 } FATFS;
 
 
 
 /* File object structure (FIL) */
 
-typedef struct
+typedef struct {
-{
+	FATFS*	fs;				/* Pointer to the owner file system object */
-    FATFS  *fs;             /* Pointer to the owner file system object */
+	WORD	id;				/* Owner file system mount ID */
-    WORD    id;             /* Owner file system mount ID */
+	BYTE	flag;			/* File status flags */
-    BYTE    flag;           /* File status flags */
+	BYTE	pad1;
-    BYTE    pad1;
+	DWORD	fptr;			/* File read/write pointer (0 on file open) */
-    DWORD   fptr;           /* File read/write pointer (0 on file open) */
+	DWORD	fsize;			/* File size */
-    DWORD   fsize;          /* File size */
+	DWORD	org_clust;		/* File start cluster (0 when fsize==0) */
-    DWORD   org_clust;      /* File start cluster (0 when fsize==0) */
+	DWORD	curr_clust;		/* Current cluster */
-    DWORD   curr_clust;     /* Current cluster */
+	DWORD	dsect;			/* Current data sector */
-    DWORD   dsect;          /* Current data sector */
 #if !_FS_READONLY
-    DWORD   dir_sect;       /* Sector containing the directory entry */
+	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) */
+	UINT	lockid;			/* File lock ID (index of file semaphore table) */
 #endif
 #if !_FS_TINY
-    BYTE    buf[_MAX_SS];   /* File data read/write buffer */
+	BYTE	buf[_MAX_SS];	/* File data read/write buffer */
 #endif
 } FIL;
 
@@ -336,19 +333,18 @@ typedef struct
 
 /* Directory object structure (DIR) */
 
-typedef struct
+typedef struct {
-{
+	FATFS*	fs;				/* Pointer to the owner file system object */
-    FATFS  *fs;             /* Pointer to the owner file system object */
+	WORD	id;				/* Owner file system mount ID */
-    WORD    id;             /* Owner file system mount ID */
+	WORD	index;			/* Current read/write index number */
-    WORD    index;          /* Current read/write index number */
+	DWORD	sclust;			/* Table start cluster (0:Root dir) */
-    DWORD   sclust;         /* Table start cluster (0:Root dir) */
+	DWORD	clust;			/* Current cluster */
-    DWORD   clust;          /* Current cluster */
+	DWORD	sect;			/* Current sector */
-    DWORD   sect;           /* Current sector */
+	BYTE*	dir;			/* Pointer to the current SFN entry in the win[] */
-    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   *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) */
+	WORD	lfn_idx;		/* Last matched LFN index number (0xFFFF:No LFN) */
 #endif
 } DIR;
 
@@ -356,17 +352,16 @@ typedef struct
 
 /* File status structure (FILINFO) */
 
-typedef struct
+typedef struct {
-{
+	DWORD	fsize;			/* File size */
-    DWORD   fsize;          /* File size */
+	WORD	fdate;			/* Last modified date */
-    WORD    fdate;          /* Last modified date */
+	WORD	ftime;			/* Last modified time */
-    WORD    ftime;          /* Last modified time */
+	BYTE	fattrib;		/* Attribute */
-    BYTE    fattrib;        /* Attribute */
+	TCHAR	fname[13];		/* Short file name (8.3 format) */
-    TCHAR   fname[13];      /* Short file name (8.3 format) */
+	DWORD	clust;			/* start cluster */
-    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 */
+	UINT 	lfsize;			/* Size of LFN buffer in TCHAR */
 #endif
 } FILINFO;
 
@@ -374,27 +369,26 @@ typedef struct
 
 /* File function return code (FRESULT) */
 
-typedef enum
+typedef enum {
-{
+	FR_OK = 0,				/* (0) Succeeded */
-    FR_OK = 0,              /* (0) Succeeded */
+	FR_DISK_ERR,			/* (1) A hard error occured in the low level disk I/O layer */
-    FR_DISK_ERR,            /* (1) A hard error occured in the low level disk I/O layer */
+	FR_INT_ERR,				/* (2) Assertion failed */
-    FR_INT_ERR,             /* (2) Assertion failed */
+	FR_NOT_READY,			/* (3) The physical drive cannot work */
-    FR_NOT_READY,           /* (3) The physical drive cannot work */
+	FR_NO_FILE,				/* (4) Could not find the file */
-    FR_NO_FILE,             /* (4) Could not find the file */
+	FR_NO_PATH,				/* (5) Could not find the path */
-    FR_NO_PATH,             /* (5) Could not find the path */
+	FR_INVALID_NAME,		/* (6) The path name format is invalid */
-    FR_INVALID_NAME,        /* (6) The path name format is invalid */
+	FR_DENIED,				/* (7) Acces denied due to prohibited access or directory full */
-    FR_DENIED,              /* (7) Acces denied due to prohibited access or directory full */
+	FR_EXIST,				/* (8) Acces denied due to prohibited access */
-    FR_EXIST,               /* (8) Acces denied due to prohibited access */
+	FR_INVALID_OBJECT,		/* (9) The file/directory object is invalid */
-    FR_INVALID_OBJECT,      /* (9) The file/directory object is invalid */
+	FR_WRITE_PROTECTED,		/* (10) The physical drive is write protected */
-    FR_WRITE_PROTECTED,     /* (10) The physical drive is write protected */
+	FR_INVALID_DRIVE,		/* (11) The logical drive number is invalid */
-    FR_INVALID_DRIVE,       /* (11) The logical drive number is invalid */
+	FR_NOT_ENABLED,			/* (12) The volume has no work area */
-    FR_NOT_ENABLED,         /* (12) The volume has no work area */
+	FR_NO_FILESYSTEM,		/* (13) There is no valid FAT volume on the physical drive */
-    FR_NO_FILESYSTEM,       /* (13) There is no valid FAT volume on the physical drive */
+	FR_MKFS_ABORTED,		/* (14) The f_mkfs() aborted due to any parameter error */
-    FR_MKFS_ABORTED,        /* (14) The f_mkfs() aborted due to any parameter error */
+	FR_TIMEOUT,				/* (15) Could not get a grant to access the volume within defined period */
-    FR_TIMEOUT,             /* (15) Could not get a grant to access the volume within defined period */
+	FR_LOCKED,				/* (16) The operation is rejected according to the file shareing policy */
-    FR_LOCKED,              /* (16) The operation is rejected according to the file shareing policy */
+	FR_NOT_ENOUGH_CORE,		/* (17) LFN working buffer could not be allocated */
-    FR_NOT_ENOUGH_CORE,     /* (17) LFN working buffer could not be allocated */
+	FR_TOO_MANY_OPEN_FILES	/* (18) Number of open files > _FS_SHARE */
-    FR_TOO_MANY_OPEN_FILES  /* (18) Number of open files > _FS_SHARE */
 } FRESULT;
 
 
@@ -403,51 +397,50 @@ typedef enum
 /* FatFs module application interface                           */
 
 /* Low Level functions */
-FRESULT l_openfilebycluster( FATFS *fs, FIL *fp, const TCHAR *path, DWORD clust,
+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 */
-                             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_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_mount (BYTE, FATFS*);						/* Mount/Unmount a logical drive */
-FRESULT f_open ( FIL *, const TCHAR *, BYTE );      /* Open or create a file */
+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_read (FIL*, void*, UINT, UINT*);			/* Read data from a file */
-FRESULT f_lseek ( FIL *, DWORD );                   /* Move file pointer of a file object */
+FRESULT f_lseek (FIL*, DWORD);						/* Move file pointer of a file object */
-FRESULT f_close ( FIL * );                          /* Close an open file object */
+FRESULT f_close (FIL*);								/* Close an open file object */
-FRESULT f_opendir ( DIR *, const TCHAR * );         /* Open an existing directory */
+FRESULT f_opendir (DIR*, const TCHAR*);				/* Open an existing directory */
-FRESULT f_readdir ( DIR *, FILINFO * );             /* Read a directory item */
+FRESULT f_readdir (DIR*, FILINFO*);					/* Read a directory item */
-FRESULT f_stat ( const TCHAR *, FILINFO * );        /* Get file status */
+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_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_getfree (const TCHAR*, DWORD*, FATFS**);	/* Get number of free clusters on the drive */
-FRESULT f_truncate ( FIL * );                       /* Truncate file */
+FRESULT f_truncate (FIL*);							/* Truncate file */
-FRESULT f_sync ( FIL * );                           /* Flush cached data of a writing 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_unlink (const TCHAR*);					/* Delete an existing file or directory */
-FRESULT f_mkdir ( const TCHAR * );                  /* Create a new 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_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_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_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_chdrive (BYTE);							/* Change current drive */
-FRESULT f_chdir ( const TCHAR * );                  /* Change current directory */
+FRESULT f_chdir (const TCHAR*);						/* Change current directory */
-FRESULT f_getcwd ( TCHAR *, UINT );                 /* Get 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_putc (TCHAR, FIL*);							/* Put a character to the file */
-int f_puts ( const TCHAR *, FIL * );                /* Put a string 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 */
+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 */
+TCHAR* f_gets (TCHAR*, int, FIL*);					/* Get a string from the file */
 #ifndef EOF
 #define EOF (-1)
 #endif
@@ -465,25 +458,25 @@ TCHAR *f_gets ( TCHAR *, int, FIL * );              /* Get a string from the fil
 
 /* RTC function */
 #if !_FS_READONLY
-DWORD get_fattime ( void );
+DWORD get_fattime (void);
 #endif
 
 /* Unicode support functions */
-#if _USE_LFN                        /* Unicode - OEM code conversion */
+#if _USE_LFN						/* Unicode - OEM code conversion */
-WCHAR ff_convert ( WCHAR, UINT );   /* OEM-Unicode bidirectional conversion */
+WCHAR ff_convert (WCHAR, UINT);		/* OEM-Unicode bidirectional conversion */
-WCHAR ff_wtoupper ( WCHAR );        /* Unicode upper-case conversion */
+WCHAR ff_wtoupper (WCHAR);			/* Unicode upper-case conversion */
-#if _USE_LFN == 3                   /* Memory functions */
+#if _USE_LFN == 3					/* Memory functions */
-void *ff_memalloc ( UINT );         /* Allocate memory block */
+void* ff_memalloc (UINT);			/* Allocate memory block */
-void ff_memfree ( void * );         /* Free 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_cre_syncobj (BYTE, _SYNC_t*);/* Create a sync object */
-int ff_del_syncobj ( _SYNC_t );     /* Delete a sync object */
+int ff_del_syncobj (_SYNC_t);		/* Delete a sync object */
-int ff_req_grant ( _SYNC_t );       /* Lock sync object */
+int ff_req_grant (_SYNC_t);			/* Lock sync object */
-void ff_rel_grant ( _SYNC_t );      /* Unlock sync object */
+void ff_rel_grant (_SYNC_t);		/* Unlock sync object */
 #endif
 
 
@@ -495,56 +488,56 @@ void ff_rel_grant ( _SYNC_t );      /* Unlock sync object */
 
 /* File access control and file status flags (FIL.flag) */
 
-#define FA_READ             0x01
+#define	FA_READ				0x01
-#define FA_OPEN_EXISTING    0x00
+#define	FA_OPEN_EXISTING	0x00
-#define FA__ERROR           0x80
+#define FA__ERROR			0x80
 
 #if !_FS_READONLY
-#define FA_WRITE            0x02
+#define	FA_WRITE			0x02
-#define FA_CREATE_NEW       0x04
+#define	FA_CREATE_NEW		0x04
-#define FA_CREATE_ALWAYS    0x08
+#define	FA_CREATE_ALWAYS	0x08
-#define FA_OPEN_ALWAYS      0x10
+#define	FA_OPEN_ALWAYS		0x10
-#define FA__WRITTEN         0x20
+#define FA__WRITTEN			0x20
-#define FA__DIRTY           0x40
+#define FA__DIRTY			0x40
 #endif
 
 
 /* FAT sub type (FATFS.fs_type) */
 
-#define FS_FAT12    1
+#define FS_FAT12	1
-#define FS_FAT16    2
+#define FS_FAT16	2
-#define FS_FAT32    3
+#define FS_FAT32	3
 
 
 /* File attribute bits for directory entry */
 
-#define AM_RDO  0x01    /* Read only */
+#define	AM_RDO	0x01	/* Read only */
-#define AM_HID  0x02    /* Hidden */
+#define	AM_HID	0x02	/* Hidden */
-#define AM_SYS  0x04    /* System */
+#define	AM_SYS	0x04	/* System */
-#define AM_VOL  0x08    /* Volume label */
+#define	AM_VOL	0x08	/* Volume label */
-#define AM_LFN  0x0F    /* LFN entry */
+#define AM_LFN	0x0F	/* LFN entry */
-#define AM_DIR  0x10    /* Directory */
+#define AM_DIR	0x10	/* Directory */
-#define AM_ARC  0x20    /* Archive */
+#define AM_ARC	0x20	/* Archive */
-#define AM_MASK 0x3F    /* Mask of defined bits */
+#define AM_MASK	0x3F	/* Mask of defined bits */
 
 
 /* Fast seek function */
-#define CREATE_LINKMAP  0xFFFFFFFF
+#define CREATE_LINKMAP	0xFFFFFFFF
 
 
 /*--------------------------------*/
 /* Multi-byte word access macros  */
 
-#if _WORD_ACCESS == 1   /* Enable word access to the FAT structure */
+#if _WORD_ACCESS == 1	/* Enable word access to the FAT structure */
-#define LD_WORD(ptr)        (WORD)(*(WORD*)(BYTE*)(ptr))
+#define	LD_WORD(ptr)		(WORD)(*(WORD*)(BYTE*)(ptr))
-#define LD_DWORD(ptr)       (DWORD)(*(DWORD*)(BYTE*)(ptr))
+#define	LD_DWORD(ptr)		(DWORD)(*(DWORD*)(BYTE*)(ptr))
-#define ST_WORD(ptr,val)    *(WORD*)(BYTE*)(ptr)=(WORD)(val)
+#define	ST_WORD(ptr,val)	*(WORD*)(BYTE*)(ptr)=(WORD)(val)
-#define ST_DWORD(ptr,val)   *(DWORD*)(BYTE*)(ptr)=(DWORD)(val)
+#define	ST_DWORD(ptr,val)	*(DWORD*)(BYTE*)(ptr)=(DWORD)(val)
-#else                   /* Use byte-by-byte access to the FAT structure */
+#else					/* Use byte-by-byte access to the FAT structure */
-#define LD_WORD(ptr)        (WORD)(((WORD)*(BYTE*)((ptr)+1)<<8)|(WORD)*(BYTE*)(ptr))
+#define	LD_WORD(ptr)		(WORD)(((WORD)*(BYTE*)((ptr)+1)<<8)|(WORD)*(BYTE*)(ptr))
-#define LD_DWORD(ptr)       (DWORD)(((DWORD)*(BYTE*)((ptr)+3)<<24)|((DWORD)*(BYTE*)((ptr)+2)<<16)|((WORD)*(BYTE*)((ptr)+1)<<8)|*(BYTE*)(ptr))
+#define	LD_DWORD(ptr)		(DWORD)(((DWORD)*(BYTE*)((ptr)+3)<<24)|((DWORD)*(BYTE*)((ptr)+2)<<16)|((WORD)*(BYTE*)((ptr)+1)<<8)|*(BYTE*)(ptr))
-#define ST_WORD(ptr,val)    *(BYTE*)(ptr)=(BYTE)(val); *(BYTE*)((ptr)+1)=(BYTE)((WORD)(val)>>8)
+#define	ST_WORD(ptr,val)	*(BYTE*)(ptr)=(BYTE)(val); *(BYTE*)((ptr)+1)=(BYTE)((WORD)(val)>>8)
-#define ST_DWORD(ptr,val)   *(BYTE*)(ptr)=(BYTE)(val); *(BYTE*)((ptr)+1)=(BYTE)((WORD)(val)>>8); *(BYTE*)((ptr)+2)=(BYTE)((DWORD)(val)>>16); *(BYTE*)((ptr)+3)=(BYTE)((DWORD)(val)>>24)
+#define	ST_DWORD(ptr,val)	*(BYTE*)(ptr)=(BYTE)(val); *(BYTE*)((ptr)+1)=(BYTE)((WORD)(val)>>8); *(BYTE*)((ptr)+2)=(BYTE)((DWORD)(val)>>16); *(BYTE*)((ptr)+3)=(BYTE)((DWORD)(val)>>24)
 #endif
 
 #ifdef __cplusplus

src/ffconf.h

@@ -7,26 +7,26 @@
 /
 /----------------------------------------------------------------------------*/
 #ifndef _FFCONF
-#define _FFCONF 8255    /* Revision ID */
+#define _FFCONF 8255	/* Revision ID */
 
 
 /*---------------------------------------------------------------------------/
 / Function and Buffer Configurations
 /----------------------------------------------------------------------------*/
 
-#define _FS_TINY    0       /* 0:Normal or 1:Tiny */
+#define	_FS_TINY	0		/* 0:Normal or 1:Tiny */
 /* When _FS_TINY is set to 1, FatFs uses the sector buffer in the file system
 /  object instead of the sector buffer in the individual file object for file
 /  data transfer. This reduces memory consumption 512 bytes each file object. */
 
 
-#define _FS_READONLY    0   /* 0:Read/Write or 1:Read only */
+#define _FS_READONLY	0	/* 0:Read/Write or 1:Read only */
 /* Setting _FS_READONLY to 1 defines read only configuration. This removes
 /  writing functions, f_write, f_sync, f_unlink, f_mkdir, f_chmod, f_rename,
 /  f_truncate and useless f_getfree. */
 
 
-#define _FS_MINIMIZE    0   /* 0 to 3 */
+#define _FS_MINIMIZE	0	/* 0 to 3 */
 /* The _FS_MINIMIZE option defines minimization level to remove some functions.
 /
 /   0: Full function.
@@ -36,19 +36,19 @@
 /   3: f_lseek is removed in addition to 2. */
 
 
-#define _USE_STRFUNC    1   /* 0:Disable or 1/2:Enable */
+#define	_USE_STRFUNC	1	/* 0:Disable or 1/2:Enable */
 /* To enable string functions, set _USE_STRFUNC to 1 or 2. */
 
 
-#define _USE_MKFS   0       /* 0:Disable or 1:Enable */
+#define	_USE_MKFS	0		/* 0:Disable or 1:Enable */
 /* To enable f_mkfs function, set _USE_MKFS to 1 and set _FS_READONLY to 0 */
 
 
-#define _USE_FORWARD    0   /* 0:Disable or 1:Enable */
+#define	_USE_FORWARD	0	/* 0:Disable or 1:Enable */
 /* To enable f_forward function, set _USE_FORWARD to 1 and set _FS_TINY to 1. */
 
 
-#define _USE_FASTSEEK   1   /* 0:Disable or 1:Enable */
+#define	_USE_FASTSEEK	1	/* 0:Disable or 1:Enable */
 /* To enable fast seek feature, set _USE_FASTSEEK to 1. */
 
 
@@ -57,7 +57,7 @@
 / Locale and Namespace Configurations
 /----------------------------------------------------------------------------*/
 
-#define _CODE_PAGE  1252
+#define _CODE_PAGE	1252
 /* The _CODE_PAGE specifies the OEM code page to be used on the target system.
 /  Incorrect setting of the code page can cause a file open failure.
 /
@@ -86,12 +86,12 @@
 /   857  - Turkish (OEM)
 /   862  - Hebrew (OEM)
 /   874  - Thai (OEM, Windows)
-/   1    - ASCII only (Valid for non LFN cfg.)
+/	1    - ASCII only (Valid for non LFN cfg.)
 */
 
 
-#define _USE_LFN    1       /* 0 to 3 */
+#define	_USE_LFN	1		/* 0 to 3 */
-#define _MAX_LFN    255     /* Maximum LFN length to handle (12 to 255) */
+#define	_MAX_LFN	255		/* Maximum LFN length to handle (12 to 255) */
 /* The _USE_LFN option switches the LFN support.
 /
 /   0: Disable LFN feature. _MAX_LFN and _LFN_UNICODE have no effect.
@@ -105,12 +105,12 @@
 /  ff_memalloc() and ff_memfree() must be added to the project. */
 
 
-#define _LFN_UNICODE    0   /* 0:ANSI/OEM or 1:Unicode */
+#define	_LFN_UNICODE	0	/* 0:ANSI/OEM or 1:Unicode */
 /* To switch the character code set on FatFs API to Unicode,
 /  enable LFN feature and set _LFN_UNICODE to 1. */
 
 
-#define _FS_RPATH   2       /* 0 to 2 */
+#define _FS_RPATH	2		/* 0 to 2 */
 /* The _FS_RPATH option configures relative path feature.
 /
 /   0: Disable relative path feature and remove related functions.
@@ -125,11 +125,11 @@
 / Physical Drive Configurations
 /----------------------------------------------------------------------------*/
 
-#define _VOLUMES    1
+#define _VOLUMES	1
 /* Number of volumes (logical drives) to be used. */
 
 
-#define _MAX_SS     512     /* 512, 1024, 2048 or 4096 */
+#define	_MAX_SS		512		/* 512, 1024, 2048 or 4096 */
 /* Maximum sector size to be handled.
 /  Always set 512 for memory card and hard disk but a larger value may be
 /  required for floppy disk (512/1024) and optical disk (512/2048).
@@ -137,13 +137,13 @@
 /  to the disk_ioctl function. */
 
 
-#define _MULTI_PARTITION    0   /* 0:Single partition or 1:Multiple partition */
+#define	_MULTI_PARTITION	0	/* 0:Single partition or 1:Multiple partition */
 /* When set to 0, each volume is bound to the same physical drive number and
 / it can mount only first primaly partition. When it is set to 1, each volume
 / is tied to the partitions listed in VolToPart[]. */
 
 
-#define _USE_ERASE  0   /* 0:Disable or 1:Enable */
+#define	_USE_ERASE	0	/* 0:Disable or 1:Enable */
 /* To enable sector erase feature, set _USE_ERASE to 1. */
 
 
@@ -152,7 +152,7 @@
 / System Configurations
 /----------------------------------------------------------------------------*/
 
-#define _WORD_ACCESS    0   /* 0 or 1 */
+#define _WORD_ACCESS	0	/* 0 or 1 */
 /* Set 0 first and it is always compatible with all platforms. The _WORD_ACCESS
 /  option defines which access method is used to the word data on the FAT volume.
 /
@@ -168,9 +168,9 @@
 /* Include a header file here to define sync object types on the O/S */
 /* #include <windows.h>, <ucos_ii.h.h>, <semphr.h> or ohters. */
 
-#define _FS_REENTRANT   0       /* 0:Disable or 1:Enable */
+#define _FS_REENTRANT	0		/* 0:Disable or 1:Enable */
-#define _FS_TIMEOUT     1000    /* Timeout period in unit of time ticks */
+#define _FS_TIMEOUT		1000	/* Timeout period in unit of time ticks */
-#define _SYNC_t         HANDLE  /* O/S dependent type of sync object. e.g. HANDLE, OS_EVENT*, ID and etc.. */
+#define	_SYNC_t			HANDLE	/* O/S dependent type of sync object. e.g. HANDLE, OS_EVENT*, ID and etc.. */
 
 /* The _FS_REENTRANT option switches the reentrancy of the FatFs module.
 /
@@ -180,7 +180,7 @@
 /      function must be added to the project. */
 
 
-#define _FS_SHARE   0   /* 0:Disable or >=1:Enable */
+#define	_FS_SHARE	0	/* 0:Disable or >=1:Enable */
 /* To enable file shareing feature, set _FS_SHARE to 1 or greater. The value
    defines how many files can be opened simultaneously. */
 

src/fileops.c

@@ -37,113 +37,81 @@ WCHAR ff_convert(WCHAR w, UINT dir) {
 
 int newcard;
 
-void file_init()
+void file_init() {
-{
+  file_res=f_mount(0, &fatfs);
-    file_res = f_mount( 0, &fatfs );
+  newcard = 0;
-    newcard = 0;
 }
 
-void file_reinit( void )
+void file_reinit(void) {
-{
+  disk_init();
-    disk_init();
+  file_init();
-    file_init();
 }
 
-FRESULT dir_open_by_filinfo( DIR *dir, FILINFO *fno )
+FRESULT dir_open_by_filinfo(DIR* dir, FILINFO* fno) {
-{
+  return l_opendirbycluster(&fatfs, dir, (TCHAR*)"", fno->clust);
-    return l_opendirbycluster( &fatfs, dir, ( TCHAR * )"", fno->clust );
 }
 
-void file_open_by_filinfo( FILINFO *fno )
+void file_open_by_filinfo(FILINFO* fno) {
-{
+  file_res = l_openfilebycluster(&fatfs, &file_handle, (TCHAR*)"", fno->clust, fno->fsize);
-    file_res = l_openfilebycluster( &fatfs, &file_handle, ( TCHAR * )"", fno->clust, fno->fsize );
 }
 
-void file_open( const uint8_t *filename, BYTE flags )
+void file_open(const uint8_t* filename, BYTE flags) {
-{
+  if (disk_state == DISK_CHANGED) {
-    if ( disk_state == DISK_CHANGED )
+    file_reinit();
-    {
+    newcard = 1;
-        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_status = file_res ? FILE_ERR : FILE_OK;
-    file_block_off = sizeof( file_buf );
-    file_block_max = sizeof( file_buf );
-    file_status = file_res ? FILE_ERR : FILE_OK;
 }
 
-void file_close()
+void file_close() {
-{
+  file_res = f_close(&file_handle);
-    file_res = f_close( &file_handle );
 }
 
-void file_seek( uint32_t offset )
+void file_seek(uint32_t offset) {
-{
+  file_res = f_lseek(&file_handle, (DWORD)offset);
-    file_res = f_lseek( &file_handle, ( DWORD )offset );
 }
 
-UINT file_read()
+UINT file_read() {
-{
+  UINT bytes_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;
-    return bytes_read;
 }
 
-UINT file_write()
+UINT file_write() {
-{
+  UINT bytes_written;
-    UINT bytes_written;
+  file_res = f_write(&file_handle, file_buf, sizeof(file_buf), &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");
-    if ( bytes_written < sizeof( file_buf ) )
+  }
-    {
+  return bytes_written;
-        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;
-    UINT bytes_read;
+  file_res = f_lseek(&file_handle, addr);
-    file_res = f_lseek( &file_handle, addr );
+  if(file_handle.fptr != addr) {
-
+    return 0;
-    if ( file_handle.fptr != addr )
+  }
-    {
+  file_res = f_read(&file_handle, buf, size, &bytes_read);
-        return 0;
+  return 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;
-    UINT bytes_written;
+  file_res = f_lseek(&file_handle, addr);
-    file_res = f_lseek( &file_handle, addr );
+  if(file_res) return 0;
-
+  file_res = f_write(&file_handle, buf, size, &bytes_written);
-    if ( file_res )
+  return bytes_written;
-    {
-        return 0;
-    }
-
-    file_res = f_write( &file_handle, buf, size, &bytes_written );
-    return bytes_written;
 }
 
-uint8_t file_getc()
+uint8_t file_getc() {
-{
+  if(file_block_off == file_block_max) {
-    if ( file_block_off == file_block_max )
+    file_block_max = file_read();
-    {
+    if(file_block_max == 0) file_status = FILE_EOF;
-        file_block_max = file_read();
+    file_block_off = 0;
-
+  }
-        if ( file_block_max == 0 )
+  return file_buf[file_block_off++];
-        {
-            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_init(void);
-void file_open( const uint8_t *filename, BYTE flags );
+void file_open(const uint8_t* filename, BYTE flags);
-FRESULT dir_open_by_filinfo( DIR *dir, FILINFO *fno_param );
+FRESULT dir_open_by_filinfo(DIR* dir, FILINFO* fno_param);
-void file_open_by_filinfo( FILINFO *fno );
+void file_open_by_filinfo(FILINFO* fno);
-void file_close( void );
+void file_close(void);
-void file_seek( uint32_t offset );
+void file_seek(uint32_t offset);
-UINT file_read( void );
+UINT file_read(void);
-UINT file_write( void );
+UINT file_write(void);
-UINT file_readblock( void *buf, uint32_t addr, uint16_t size );
+UINT file_readblock(void* buf, uint32_t addr, uint16_t size);
-UINT file_writeblock( 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,433 +31,291 @@
 #include "ff.h"
 #include "smc.h"
 #include "fileops.h"
-#include "crc.h"
+#include "crc32.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;
-    DIR dir;
+  FRESULT res;
-    FRESULT res;
+  FILINFO fno;
-    FILINFO fno;
+  fno.lfname = NULL;
-    fno.lfname = NULL;
+  res = f_opendir(&dir, (TCHAR*)path);
-    res = f_opendir( &dir, ( TCHAR * )path );
+  uint16_t numentries = 0;
-    uint16_t numentries = 0;
+  if (res == FR_OK) {
+    for (;;) {
+      res = f_readdir(&dir, &fno);
+      if(res != FR_OK || fno.fname[0] == 0)break;
+      numentries++;
+    }
+  }
+  return numentries;
+}
 
-    if ( res == FR_OK )
+uint32_t scan_dir(char* path, FILINFO* fno_param, char mkdb, uint32_t this_dir_tgt) {
-    {
+  DIR dir;
-        for ( ;; )
+  FILINFO fno;
-        {
+  FRESULT res;
-            res = f_readdir( &dir, &fno );
+  uint8_t len;
+  TCHAR* fn;
+  static unsigned char depth = 0;
+  static uint32_t crc;
+  static uint32_t db_tgt;
+  static uint32_t next_subdir_tgt;
+  static uint32_t parent_tgt;
+  static uint32_t dir_end = 0;
+  static uint8_t was_empty = 0;
+  static uint16_t num_files_total = 0;
+  static uint16_t num_dirs_total = 0;
+  uint32_t dir_tgt;
+  uint16_t numentries;
+  uint32_t dirsize;
+  uint8_t pass = 0;
+  char buf[7];
+  char *size_units[3] = {" ", "k", "M"};
+  uint32_t entry_fsize;
+  uint8_t entry_unit_idx;
 
-            if ( res != FR_OK || fno.fname[0] == 0 )
+  dir_tgt = this_dir_tgt;
-            {
+  if(depth==0) {
-                break;
+    crc = 0;
-            }
+    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);
+  }
 
+  fno.lfsize = 255;
+  fno.lfname = (TCHAR*)file_lfn;
+  numentries=0;
+  for(pass = 0; pass < 2; pass++) {
+    if(pass) {
+      num_dirs_total++;
+      dirsize = 4*(numentries);
+      next_subdir_tgt += dirsize + 4;
+      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);
+      }
+    }
+    if(fno_param) {
+      res = dir_open_by_filinfo(&dir, fno_param);
+    } 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);
+          db_tgt &= 0xffff0000;
+          db_tgt += 0x00010000;
+          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;
+        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;
+          }
+          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) {
+          depth++;
+          if(depth < FS_MAX_DEPTH) {
             numentries++;
-        }
+            if(pass) {
-    }
+              path[len]='/';
-
+              strncpy(path+len+1, (char*)fn, sizeof(fs_path)-len);
-    return numentries;
+              if(mkdb) {
-}
+                uint16_t pathlen = strlen(path);
-
+//                printf("d=%d Saving %lx to Address %lx  [dir]\n", depth, db_tgt, dir_tgt);
-uint32_t scan_dir( char *path, FILINFO *fno_param, char mkdb, uint32_t this_dir_tgt )
+                /* save element:
-{
+                   - path name
-    DIR dir;
+                   - pointer to sub dir structure */
-    FILINFO fno;
+                if((db_tgt&0xffff) > ((0x10000-(sizeof(next_subdir_tgt) + sizeof(len) + pathlen + 2))&0xffff)) {
-    FRESULT res;
+                  printf("switch! old=%lx ", db_tgt);
-    uint8_t len;
+                  db_tgt &= 0xffff0000;
-    TCHAR *fn;
+                  db_tgt += 0x00010000;
-    static unsigned char depth = 0;
+                  printf("new=%lx\n", db_tgt);
-    static uint32_t crc, fncrc;
-    static uint32_t db_tgt;
-    static uint32_t next_subdir_tgt;
-    static uint32_t parent_tgt;
-    static uint32_t dir_end = 0;
-    static uint8_t was_empty = 0;
-    static 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;
-    char buf[7];
-    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 )
-    {
-        crc = 0;
-        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 );
-    }
-
-    fno.lfsize = 255;
-    fno.lfname = ( TCHAR * )file_lfn;
-    numentries = 0;
-
-    for ( pass = 0; pass < ( mkdb ? 2 : 1 ); pass++ )
-    {
-        if ( pass )
-        {
-            dirsize = 4 * ( numentries );
-
-            if ( ( ( next_subdir_tgt + dirsize + 8 ) & 0xff0000 ) > ( next_subdir_tgt & 0xff0000 ) )
-            {
-                printf( "switchdir! old=%lX ", next_subdir_tgt + dirsize + 4 );
-                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 )
-            {
-                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 )
-            {
-                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 ( 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 );
-                    db_tgt &= 0xffff0000;
-                    db_tgt += 0x00010000;
-                    printf( "new=%lx\n", db_tgt );
                 }
-
+//                printf("    Saving dir descriptor to %lx tgt=%lx, path=%s\n", db_tgt, next_subdir_tgt, path);
-                //        printf("writing link to parent, %lx to address %lx [../]\n", parent_tgt-SRAM_MENU_ADDR, db_tgt);
+                /* write element pointer to current dir structure */
-                sram_writelong( ( parent_tgt - SRAM_MENU_ADDR ), db_tgt );
+                sram_writelong((db_tgt-SRAM_MENU_ADDR)|((uint32_t)0x80<<24), dir_tgt);
-                sram_writebyte( 0, db_tgt + sizeof( next_subdir_tgt ) );
+                /* save element:
-                sram_writeblock( "../\0", db_tgt + sizeof( next_subdir_tgt ) + sizeof( len ), 4 );
+                   - path name
-                sram_writelong( ( db_tgt - SRAM_MENU_ADDR ) | ( ( uint32_t )0x81 << 24 ), dir_tgt );
+                   - pointer to sub dir structure */
-                db_tgt += sizeof( next_subdir_tgt ) + sizeof( len ) + 4;
+                sram_writelong((next_subdir_tgt-SRAM_MENU_ADDR), db_tgt);
-                dir_tgt += 4;
+                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;
             }
-
+          }
-            len = strlen( ( char * )path );
+          depth--;
-
+          path[len]=0;
-            /* scan at most DIR_FILE_MAX entries per directory */
+        } else {
-            for ( entrycnt = 0; entrycnt < DIR_FILE_MAX; entrycnt++ )
+          SNES_FTYPE type = determine_filetype((char*)fn);
-            {
+          if(type != TYPE_UNKNOWN) {
-                //        toggle_read_led();
+            num_files_total++;
-                res = f_readdir( &dir, &fno );
+            numentries++;
-
+            if(pass) {
-                if ( res != FR_OK || fno.fname[0] == 0 )
+              if(mkdb) {
-                {
+/*                snes_romprops_t romprops; */
-                    if ( pass )
+                path[len]='/';
-                    {
+                strncpy(path+len+1, (char*)fn, sizeof(fs_path)-len);
-                        /*            if(!numentries) was_empty=1;*/
+                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);
+                      db_tgt &= 0xffff0000;
+                      db_tgt += 0x00010000;
+                      printf("new=%lx\n", db_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)); */
+                    entry_fsize = fno.fsize;
+                    entry_unit_idx = 0;
+                    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;
                     break;
+                  case TYPE_UNKNOWN:
+                  default:
+                   break;
                 }
-
+                path[len]=0;
-                fn = *fno.lfname ? fno.lfname : fno.fname;
+/*              printf("%s ", path);
-
+                _delay_ms(30); */
-                if ( ( *fn == '.' ) || !( strncasecmp( fn, SYS_DIR_NAME, sizeof( SYS_DIR_NAME ) ) ) )
+              }
-                {
+            } else {
-                    continue;
+              TCHAR* fn2 = fn;
-                }
+              while(*fn2 != 0) {
-
+                crc += crc32_update(crc, *((unsigned char*)fn2++));
-                if ( fno.fattrib & AM_DIR )
+              }
-                {
-                    depth++;
-
-                    if ( depth < FS_MAX_DEPTH )
-                    {
-                        numentries++;
-
-                        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 );
-                                    db_tgt &= 0xffff0000;
-                                    db_tgt += 0x00010000;
-                                    printf( "new=%lx\n", db_tgt );
-                                }
-
-                                /* write element pointer to current dir structure */
-                                sram_writelong( ( db_tgt - SRAM_MENU_ADDR ) | ( ( uint32_t )0x80 << 24 ), dir_tgt );
-                                /* 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 );
-                                    }
-
-                                    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)); */
-                                    entry_fsize = fno.fsize;
-                                    entry_unit_idx = 0;
-
-                                    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;
-                                    break;
-
-                                case TYPE_UNKNOWN:
-                                default:
-                                    break;
-                                }
-
-                                path[len] = 0;
-                                /*              printf("%s ", path);
-                                                _delay_ms(30); */
-                            }
-                        }
-                        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
+      }
-        {
+    } else uart_putc(0x30+res);
-            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);
-    DBG_FS printf( "db_tgt=%lx dir_end=%lx\n", db_tgt, dir_end );
+  sram_writeshort(num_files_total, SRAM_DB_ADDR+12);
-    sram_writelong( db_tgt, SRAM_DB_ADDR + 4 );
+  sram_writeshort(num_dirs_total, SRAM_DB_ADDR+14);
-    sram_writelong( dir_end, SRAM_DB_ADDR + 8 );
+  return crc;
-    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 )
+SNES_FTYPE determine_filetype(char* filename) {
-{
+  char* ext = strrchr(filename, '.');
-    char *ext = strrchr( filename, '.' );
+  if(ext == NULL)
-
-    if ( ext == NULL )
-    {
-        return TYPE_UNKNOWN;
-    }
-
-    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"))
-         ||(!strcasecmp(ext+1, "UPS"))
-        ) {
-        return TYPE_IPS;
-      }*/
-    if ( !strcasecmp( ext + 1, "SPC" ) )
-    {
-        return TYPE_SPC;
-    }
-
     return TYPE_UNKNOWN;
+  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"))
+     ||(!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;
+  }*/
+  return TYPE_UNKNOWN;
 }
 
-FRESULT get_db_id( uint32_t *id )
+FRESULT get_db_id(uint32_t* id) {
-{
+  file_open((uint8_t*)"/sd2snes/sd2snes.db", FA_READ);
-    file_open( ( uint8_t * )"/sd2snes/sd2snes.db", FA_READ );
+  if(file_res == FR_OK) {
-
+    file_readblock(id, 0, 4);
-    if ( file_res == FR_OK )
+/* XXX */// *id=0xdead;
-    {
+    file_close();
-        file_readblock( id, 0, 4 );
+  } else {
-        /* XXX */// *id=0xdead;
+    *id=0xdeadbeef;
-        file_close();
+  }
-    }
+  return file_res;
-    else
-    {
-        *id = 0xdeadbeef;
-    }
-
-    return file_res;
 }
 
-int get_num_dirent( uint32_t addr )
+int get_num_dirent(uint32_t addr) {
-{
+  int result = 0;
-    int result = 0;
+  while(sram_readlong(addr+result*4)) {
-
+    result++;
-    while ( sram_readlong( addr + result * 4 ) )
+  }
-    {
+  return result;
-        result++;
-    }
-
-    return result;
 }
 
-void sort_all_dir( uint32_t endaddr )
+void sort_all_dir(uint32_t endaddr) {
-{
+  uint32_t entries = 0;
-    uint32_t entries = 0;
+  uint32_t current_base = SRAM_DIR_ADDR;
-    uint32_t current_base = SRAM_DIR_ADDR;
+  while(current_base<(endaddr)) {
-
+    while(sram_readlong(current_base+entries*4)) {
-    while ( current_base < ( endaddr ) )
+      entries++;
-    {
-        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;
-        entries = 0;
     }
+    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

@@ -35,25 +35,24 @@
 
 #include "ff.h"
 
-#define FS_MAX_DEPTH    (10)
+#define FS_MAX_DEPTH	(10)
-#define SYS_DIR_NAME    ((const char*)"sd2snes")
+#define SYS_DIR_NAME	((const uint8_t*)"sd2snes")
-typedef enum
+typedef enum {
-{
+  TYPE_UNKNOWN = 0, /* 0 */
-    TYPE_UNKNOWN = 0, /* 0 */
+  TYPE_SMC,         /* 1 */
-    TYPE_SMC,         /* 1 */
+  TYPE_SRM,         /* 2 */
-    TYPE_SRM,         /* 2 */
+  TYPE_SPC,         /* 3 */
-    TYPE_SPC,         /* 3 */
+  TYPE_IPS          /* 4 */
-    TYPE_IPS          /* 4 */
 } SNES_FTYPE;
 
 
 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 );
+uint16_t scan_flat(const char* path);
-uint32_t scan_dir( char *path, FILINFO *fno_param, char mkdb, uint32_t this_subdir_tgt );
+uint32_t scan_dir(char* path, FILINFO* fno_param, char mkdb, uint32_t this_subdir_tgt);
-FRESULT get_db_id( uint32_t * );
+FRESULT get_db_id(uint32_t*);
-int get_num_dirent( uint32_t addr );
+int get_num_dirent(uint32_t addr);
-void sort_all_dir( uint32_t endaddr );
+void sort_all_dir(uint32_t endaddr);
 
 #endif

src/fpga.c

@@ -52,208 +52,147 @@
 #include "rle.h"
 #include "cfgware.h"
 
-void fpga_set_prog_b( uint8_t val )
+void fpga_set_prog_b(uint8_t val) {
-{
+  if(val)
-    if ( val )
+    BITBAND(PROGBREG->FIOSET, PROGBBIT) = 1;
-    {
+  else
-        BITBAND( PROGBREG->FIOSET, PROGBBIT ) = 1;
+    BITBAND(PROGBREG->FIOCLR, PROGBBIT) = 1;
-    }
-    else
-    {
-        BITBAND( PROGBREG->FIOCLR, PROGBBIT ) = 1;
-    }
 }
 
-void fpga_set_cclk( uint8_t val )
+void fpga_set_cclk(uint8_t val) {
-{
+  if(val)
-    if ( val )
+    BITBAND(CCLKREG->FIOSET, CCLKBIT) = 1;
-    {
+  else
-        BITBAND( CCLKREG->FIOSET, CCLKBIT ) = 1;
+    BITBAND(CCLKREG->FIOCLR, CCLKBIT) = 1;
-    }
-    else
-    {
-        BITBAND( CCLKREG->FIOCLR, CCLKBIT ) = 1;
-    }
 }
 
-int fpga_get_initb()
+int fpga_get_initb() {
-{
+  return BITBAND(INITBREG->FIOPIN, INITBBIT);
-    return BITBAND( INITBREG->FIOPIN, INITBBIT );
 }
 
-void fpga_init()
+void fpga_init() {
-{
+/* mainly GPIO directions */
-    /* mainly GPIO directions */
+  BITBAND(CCLKREG->FIODIR, CCLKBIT) = 1; /* CCLK */
-    BITBAND( CCLKREG->FIODIR, CCLKBIT ) = 1; /* CCLK */
+  BITBAND(DONEREG->FIODIR, DONEBIT) = 0; /* DONE */
-    BITBAND( DONEREG->FIODIR, DONEBIT ) = 0; /* DONE */
+  BITBAND(PROGBREG->FIODIR, PROGBBIT) = 1; /* PROG_B */
-    BITBAND( PROGBREG->FIODIR, PROGBBIT ) = 1; /* PROG_B */
+  BITBAND(DINREG->FIODIR, DINBIT) = 1; /* DIN */
-    BITBAND( DINREG->FIODIR, DINBIT ) = 1; /* DIN */
+  BITBAND(INITBREG->FIODIR, INITBBIT) = 0; /* INIT_B */
-    BITBAND( INITBREG->FIODIR, INITBBIT ) = 0; /* INIT_B */
 
-    LPC_GPIO2->FIOMASK1 = 0;
+  LPC_GPIO2->FIOMASK1 = 0;
-    SPI_OFFLOAD = 0;
 
-    fpga_set_cclk( 0 );  /* initial clk=0 */
+  SPI_OFFLOAD=0;
+  fpga_set_cclk(0);    /* initial clk=0 */
 }
 
-int fpga_get_done( void )
+int fpga_get_done(void) {
-{
+  return BITBAND(DONEREG->FIOPIN, DONEBIT);
-    return BITBAND( DONEREG->FIOPIN, DONEBIT );
 }
 
-void fpga_postinit()
+void fpga_postinit() {
-{
+  LPC_GPIO2->FIOMASK1 = 0;
-    LPC_GPIO2->FIOMASK1 = 0;
 }
 
-void fpga_pgm( uint8_t *filename )
+void fpga_pgm(uint8_t* filename) {
-{
+  int MAXRETRIES = 10;
-    int MAXRETRIES = 10;
+  int retries = MAXRETRIES;
-    int retries = MAXRETRIES;
+  uint8_t data;
-    uint8_t data;
+  int i;
-    int i;
+  tick_t timeout;
-    tick_t timeout;
+  do {
-
+    i=0;
-    do
+    timeout = getticks() + 100;
-    {
+    fpga_set_prog_b(0);
-        i = 0;
+if(BITBAND(PROGBREG->FIOPIN, PROGBBIT)) {
-        timeout = getticks() + 100;
+  printf("PROGB is stuck high!\n");
-        fpga_set_prog_b( 0 );
+  led_panic();
-
+}
-        if ( BITBAND( PROGBREG->FIOPIN, PROGBBIT ) )
+    uart_putc('P');
-        {
+    fpga_set_prog_b(1);
-            printf( "PROGB is stuck high!\n" );
+    while(!fpga_get_initb()){
-            led_panic();
+      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" );
-            led_panic();
-        }
-
-        LPC_GPIO2->FIOMASK1 = ~( BV( 0 ) );
-        uart_putc( 'p' );
-
-
-        /* open configware file */
-        file_open( filename, FA_READ );
-
-        if ( file_res )
-        {
-            uart_putc( '?' );
-            uart_putc( 0x30 + file_res );
-            return;
-        }
-
-        uart_putc( 'C' );
-
-        for ( ;; )
-        {
-            data = rle_file_getc();
-            i++;
-
-            if ( file_status || file_res )
-            {
-                break;    /* error or eof */
-            }
-
-            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 );
         led_panic();
+      }
+    };
+    if(fpga_get_done()) {
+      printf("DONE is stuck high!\n");
+      led_panic();
     }
+    LPC_GPIO2->FIOMASK1 = ~(BV(0));
+    //uart_putc('p');
 
-    printf( "FPGA configured\n" );
+
-    fpga_postinit();
+    /* open configware file */
+    file_open(filename, FA_READ);
+    if(file_res) {
+      //uart_putc('?');
+      //uart_putc(0x30+file_res);
+      return;
+    }
+    //uart_putc('C');
+
+    for (;;) {
+      data = rle_file_getc();
+      i++;
+      if (file_status || file_res) break;   /* error or eof */
+      FPGA_SEND_BYTE_SERIAL(data);
+    }
+    //uart_putc('c');
+    file_close();
+    printf("%s: %d bytes programmed\n", __func__, 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("%s: FPGA configured\n", __func__);
+  fpga_postinit();
 }
 
-void fpga_rompgm()
+void fpga_rompgm() {
-{
+  int MAXRETRIES = 10;
-    int MAXRETRIES = 10;
+  int retries = MAXRETRIES;
-    int retries = MAXRETRIES;
+  uint8_t data;
-    uint8_t data;
+  int i;
-    int i;
+  tick_t timeout;
-    tick_t timeout;
+  do {
-
+    i=0;
-    do
+    timeout = getticks() + 100;
-    {
+    fpga_set_prog_b(0);
-        i = 0;
+    //uart_putc('P');
-        timeout = getticks() + 100;
+    fpga_set_prog_b(1);
-        fpga_set_prog_b( 0 );
+    while(!fpga_get_initb()){
-        uart_putc( 'P' );
+      if(getticks() > timeout) {
-        fpga_set_prog_b( 1 );
+        printf("no response from FPGA trying to initiate configuration!\n");
-
-        while ( !fpga_get_initb() )
-        {
-            if ( getticks() > timeout )
-            {
-                printf( "no response from FPGA trying to initiate configuration!\n" );
-                led_panic();
-            }
-        };
-
-        if ( fpga_get_done() )
-        {
-            printf( "DONE is stuck high!\n" );
-            led_panic();
-        }
-
-        LPC_GPIO2->FIOMASK1 = ~( BV( 0 ) );
-        uart_putc( 'p' );
-
-        /* open configware file */
-        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 );
-        }
-
-        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();
+      }
+    };
+    if(fpga_get_done()) {
+      printf("DONE is stuck high!\n");
+      led_panic();
     }
+    LPC_GPIO2->FIOMASK1 = ~(BV(0));
+    //uart_putc('p');
 
-    printf( "FPGA configured\n" );
+    /* open configware file */
-    fpga_postinit();
+    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);
+    }
+    //uart_putc('c');
+    printf("%s: %d bytes programmed\n", __func__, 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("%s: FPGA configured\n", __func__);
+  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_prog_b(uint8_t val);
-void fpga_set_cclk( uint8_t val );
+void fpga_set_cclk(uint8_t val);
-int fpga_get_initb( void );
+int fpga_get_initb(void);
 
-void fpga_init( void );
+void fpga_init(void);
-void fpga_postinit( void );
+void fpga_postinit(void);
-void fpga_pgm( uint8_t *filename );
+void fpga_pgm(uint8_t* filename);
-void fpga_rompgm( void );
+void fpga_rompgm(void);
 
 uint8_t SPI_OFFLOAD;
 
@@ -54,16 +54,16 @@ uint8_t SPI_OFFLOAD;
 #define DONEBIT  (22)
 
 
-#define FPGA_TEST_TOKEN (0xa5)
+#define FPGA_TEST_TOKEN	(0xa5)
 
 // some macros for bulk transfers (faster)
-#define FPGA_SEND_BYTE_SERIAL(data) do {SET_FPGA_DIN(data>>7); CCLK();\
+#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>>6); CCLK(); SET_FPGA_DIN(data>>5); CCLK();\
-        SET_FPGA_DIN(data>>4); CCLK(); SET_FPGA_DIN(data>>3); 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>>2); CCLK(); SET_FPGA_DIN(data>>1); CCLK();\
-        SET_FPGA_DIN(data); CCLK();} while (0)
+SET_FPGA_DIN(data); CCLK();} while (0)
-#define SET_CCLK()          do {BITBAND(LPC_GPIO0->FIOSET, 11) = 1;} 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 CLR_CCLK()			do {BITBAND(LPC_GPIO0->FIOCLR, 11) = 1;} while (0)
-#define CCLK()              do {SET_CCLK(); CLR_CCLK();} while (0)
+#define CCLK()				do {SET_CCLK(); CLR_CCLK();} while (0)
-#define SET_FPGA_DIN(data)      do {LPC_GPIO2->FIOPIN1 = data;} while (0)
+#define SET_FPGA_DIN(data)		do {LPC_GPIO2->FIOPIN1 = data;} while (0)
 #endif

src/fpga_spi.c

@@ -1,6 +1,6 @@
 /* sd2snes - SD card based universal cartridge for the SNES
-   Copyright (C) 2009-2012 Maximilian Rehkopf <otakon@gmx.net>
+   Copyright (C) 2009-2010 Maximilian Rehkopf <otakon@gmx.net>
-   uC firmware portion
+   AVR firmware portion
 
    Inspired by and based on code from sd2iec, written by Ingo Korb et al.
    See sdcard.c|h, config.h.
@@ -25,110 +25,110 @@
 */
 /*
 
-    SPI commands
+	SPI commands
 
-    cmd param       function
+	cmd	param		function
    =============================================
-    0t  bbhhll      set address to 0xbbhhll
+	0t	bbhhll		set address to 0xbbhhll
-                t = target
+				t = target
-                target: 0 = RAM
+				target: 0 = RAM
-                    1 = MSU Audio buffer
+					1 = MSU Audio buffer
-                    2 = MSU Data buffer
+					2 = MSU Data buffer
-                targets 1 & 2 only require 2 address bytes to
+				targets 1 & 2 only require 2 address bytes to
-                be written.
+				be written.
 
-    10  bbhhll      set SNES input address mask to 0xbbhhll
+	10	bbhhll		set SNES input address mask to 0xbbhhll
-    20  bbhhll      set SRAM address mask to 0xbbhhll
+	20	bbhhll		set SRAM address mask to 0xbbhhll
 
-    3m  -       set mapper to m
+	3m	-		set mapper to m
-                0=HiROM, 1=LoROM, 2=ExHiROM, 6=SF96, 7=Menu
+				0=HiROM, 1=LoROM, 2=ExHiROM, 6=SF96, 7=Menu
 
-    4s  -       trigger SD DMA (512b from SD to memory)
+	4s	-		trigger SD DMA (512b from SD to memory)
                                 s: Bit 2 = partial, Bit 1:0 = target
                                 target: see above
 
-    60  xsssyeee    set SD DMA partial transfer parameters
+	60	xsssyeee	set SD DMA partial transfer parameters
-                x: 0 = read from sector start (skip until
+				x: 0 = read from sector start (skip until
-                       start offset reached)
+				       start offset reached)
-                   8 = assume mid-sector position and read
+				   8 = assume mid-sector position and read
-                       immediately
+				       immediately
-                sss = start offset (msb first)
+				sss = start offset (msb first)
-                y: 0 = skip rest of SD sector
+				y: 0 = skip rest of SD sector
-                   8 = stop mid-sector if end offset reached
+				   8 = stop mid-sector if end offset reached
-                eee = end offset (msb first)
+				eee = end offset (msb first)
 
-    8p  -       read (RAM only)
+	8p	-		read (RAM only)
-                p: 0 = no increment after read
+				p: 0 = no increment after read
-                   8 = increment after read
+				   8 = increment after read
 
-    9p  {xx}*       write xx
+	9p	{xx}*		write xx
-                p: i-tt
+				p: i-tt
-                tt = target (see above)
+				tt = target (see above)
-                i = increment (see above)
+				i = increment (see above)
 
-    E0  ssrr        set MSU-1 status register (=FPGA status [7:0])
+	E0	ssrr		set MSU-1 status register (=FPGA status [7:0])
-                ss = bits to set in status register (1=set)
+				ss = bits to set in status register (1=set)
-                rr = bits to reset in status register (1=reset)
+				rr = bits to reset in status register (1=reset)
 
-    E1  -       pause DAC
+	E1	-		pause DAC
-    E2  -       resume/play DAC
+	E2	-		resume/play DAC
-    E3  -       reset DAC playback pointer (0)
+	E3	-		reset DAC playback pointer (0)
-    E4  hhll        set MSU read pointer
+	E4	hhll		set MSU read pointer
 
-    E5  tt{7}       set RTC (SPC7110 format + 1000s of year,
+	E5	tt{7}		set RTC (SPC7110 format + 1000s of year,
-                         nibbles packed)
+				         nibbles packed)
                                 eg 0x20111210094816 is 2011-12-10, 9:48:16
-    E6  ssrr        set/reset BS-X status register [7:0]
+	E6	ssrr		set/reset BS-X status register [7:0]
-    E7  -       reset SRTC state
+	E7	-		reset SRTC state
-    E8  -       reset DSP program and data ROM write pointers
+	E8	-		reset DSP program and data ROM write pointers
-    E9  hhmmllxxxx  write+incr. DSP program ROM (xxxx=dummy writes)
+	E9	hhmmllxxxx	write+incr. DSP program ROM (xxxx=dummy writes)
-    EA  hhllxxxx    write+incr. DSP data ROM (xxxx=dummy writes)
+	EA	hhllxxxx	write+incr. DSP data ROM (xxxx=dummy writes)
-    EB  -       put DSP into reset
+	EB	-		put DSP into reset
-    EC  -       release DSP from reset
+	EC	-		release DSP from reset
-    ED  -       set feature enable bits (see below)
+	ED	-		set feature enable bits (see below)
-    EE  -       set $213f override value (0=NTSC, 1=PAL)
+	EE	-		set $213f override value (0=NTSC, 1=PAL)
-    F0  -       receive test token (to see if FPGA is alive)
+	F0	-		receive test token (to see if FPGA is alive)
-    F1  -       receive status (16bit, MSB first), see below
+	F1	-		receive status (16bit, MSB first), see below
 
-    F2  -       get MSU data address (32bit, MSB first)
+	F2	-		get MSU data address (32bit, MSB first)
-    F3  -       get MSU audio track no. (16bit, MSB first)
+	F3	-		get MSU audio track no. (16bit, MSB first)
-    F4  -       get MSU volume (8bit)
+	F4	-		get MSU volume (8bit)
 
-    FE  -       get SNES master clock frequency (32bit, MSB first)
+	FE	-		get SNES master clock frequency (32bit, MSB first)
-                measured 1x/sec
+				measured 1x/sec
-    FF  {xx}*       echo (returns the sent data in the next byte)
+	FF	{xx}*		echo (returns the sent data in the next byte)
 
-    FPGA status word:
+	FPGA status word:
-    bit function
+	bit	function
    ==========================================================================
-     15 SD DMA busy (0=idle, 1=busy)
+	 15	SD DMA busy (0=idle, 1=busy)
-     14 DAC read pointer MSB
+	 14	DAC read pointer MSB
-     13 MSU read pointer MSB
+	 13	MSU read pointer MSB
-     12 reserved (0)
+	 12	reserved (0)
-     11 reserved (0)
+	 11	reserved (0)
-     10 reserved (0)
+	 10	reserved (0)
-      9 reserved (0)
+	  9	reserved (0)
-      8 reserved (0)
+	  8	reserved (0)
-      7 reserved (0)
+	  7	reserved (0)
-      6 reserved (0)
+	  6	reserved (0)
-      5 MSU1 Audio request from SNES
+	  5	MSU1 Audio request from SNES
-      4 MSU1 Data request from SNES
+	  4	MSU1 Data request from SNES
-      3 reserved (0)
+	  3	reserved (0)
-      2 MSU1 Audio control status: 0=no repeat, 1=repeat
+	  2	MSU1 Audio control status: 0=no repeat, 1=repeat
-      1 MSU1 Audio control status: 0=pause, 1=play
+	  1	MSU1 Audio control status: 0=pause, 1=play
-      0 MSU1 Audio control request
+	  0	MSU1 Audio control request
 
-    FPGA feature enable bits:
+	FPGA feature enable bits:
-    bit function
+	bit	function
    ==========================================================================
-     7  -
+	 7	-
-     6  -
+	 6	-
-     5  -
+	 5	-
-     4  enable $213F override
+	 4	enable $213F override
-     3  enable MSU1 registers
+	 3	enable MSU1 registers
-     2  enable SRTC registers
+	 2	enable SRTC registers
-     1  enable ST0010 mapping
+	 1	enable ST0010 mapping
-     0  enable DSPx mapping
+	 0	enable DSPx mapping
 
 */
 
@@ -142,292 +142,287 @@
 #include "timer.h"
 #include "sdnative.h"
 
-void fpga_spi_init( void )
+void fpga_spi_init(void) {
-{
+  spi_init(SPI_SPEED_FAST);
-    spi_init();
+  BITBAND(FPGA_MCU_RDY_REG->FIODIR, FPGA_MCU_RDY_BIT) = 0;
-    BITBAND( FPGA_MCU_RDY_REG->FIODIR, FPGA_MCU_RDY_BIT ) = 0;
 }
 
-void set_msu_addr( uint16_t address )
+void set_msu_addr(uint16_t address) {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0x02);
-    FPGA_TX_BYTE( FPGA_CMD_SETADDR | FPGA_TGT_MSUBUF );
+  FPGA_TX_BYTE((address>>8)&0xff);
-    FPGA_TX_BYTE( ( address >> 8 ) & 0xff );
+  FPGA_TX_BYTE((address)&0xff);
-    FPGA_TX_BYTE( ( address ) & 0xff );
+  FPGA_DESELECT();
-    FPGA_DESELECT();
 }
 
-void set_dac_addr( uint16_t address )
+void set_dac_addr(uint16_t address) {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0x01);
-    FPGA_TX_BYTE( FPGA_CMD_SETADDR | FPGA_TGT_DACBUF );
+  FPGA_TX_BYTE((address>>8)&0xff);
-    FPGA_TX_BYTE( ( address >> 8 ) & 0xff );
+  FPGA_TX_BYTE((address)&0xff);
-    FPGA_TX_BYTE( ( address ) & 0xff );
+  FPGA_DESELECT();
-    FPGA_DESELECT();
 }
 
-void set_mcu_addr( uint32_t address )
+void set_mcu_addr(uint32_t address) {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0x00);
-    FPGA_TX_BYTE( FPGA_CMD_SETADDR | FPGA_TGT_MEM );
+  FPGA_TX_BYTE((address>>16)&0xff);
-    FPGA_TX_BYTE( ( address >> 16 ) & 0xff );
+  FPGA_TX_BYTE((address>>8)&0xff);
-    FPGA_TX_BYTE( ( address >> 8 ) & 0xff );
+  FPGA_TX_BYTE((address)&0xff);
-    FPGA_TX_BYTE( ( address ) & 0xff );
+  FPGA_DESELECT();
-    FPGA_DESELECT();
 }
 
-void set_saveram_mask( uint32_t mask )
+void set_saveram_mask(uint32_t mask) {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0x20);
-    FPGA_TX_BYTE( FPGA_CMD_SETRAMMASK );
+  FPGA_TX_BYTE((mask>>16)&0xff);
-    FPGA_TX_BYTE( ( mask >> 16 ) & 0xff );
+  FPGA_TX_BYTE((mask>>8)&0xff);
-    FPGA_TX_BYTE( ( mask >> 8 ) & 0xff );
+  FPGA_TX_BYTE((mask)&0xff);
-    FPGA_TX_BYTE( ( mask ) & 0xff );
+  FPGA_DESELECT();
-    FPGA_DESELECT();
 }
 
-void set_rom_mask( uint32_t mask )
+void set_rom_mask(uint32_t mask) {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0x10);
-    FPGA_TX_BYTE( FPGA_CMD_SETROMMASK );
+  FPGA_TX_BYTE((mask>>16)&0xff);
-    FPGA_TX_BYTE( ( mask >> 16 ) & 0xff );
+  FPGA_TX_BYTE((mask>>8)&0xff);
-    FPGA_TX_BYTE( ( mask >> 8 ) & 0xff );
+  FPGA_TX_BYTE((mask)&0xff);
-    FPGA_TX_BYTE( ( mask ) & 0xff );
+  FPGA_DESELECT();
-    FPGA_DESELECT();
 }
 
-void set_mapper( uint8_t val )
+void set_mapper(uint8_t val) {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0x30 | (val & 0x0f));
-    FPGA_TX_BYTE( FPGA_CMD_SETMAPPER( val ) );
+  FPGA_DESELECT();
-    FPGA_DESELECT();
 }
 
-uint8_t fpga_test()
+uint8_t fpga_test() {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0xF0); /* TEST */
-    FPGA_TX_BYTE( FPGA_CMD_TEST );
+  FPGA_TX_BYTE(0x00); /* dummy */
-    uint8_t result = FPGA_RX_BYTE();
+  uint8_t result = FPGA_RX_BYTE();
-    FPGA_DESELECT();
+  FPGA_DESELECT();
-    return result;
+  return result;
 }
 
-uint16_t fpga_status()
+uint16_t fpga_status() {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0xF1); /* STATUS */
-    FPGA_TX_BYTE( FPGA_CMD_GETSTATUS );
+  FPGA_TX_BYTE(0x00); /* dummy */
-    uint16_t result = ( FPGA_RX_BYTE() ) << 8;
+  uint16_t result = (FPGA_RX_BYTE()) << 8;
-    result |= FPGA_RX_BYTE();
+  result |= FPGA_RX_BYTE();
-    FPGA_DESELECT();
+  FPGA_DESELECT();
-    return result;
+  return result;
 }
 
-void fpga_set_sddma_range( uint16_t start, uint16_t end )
+void fpga_set_sddma_range(uint16_t start, uint16_t end) {
-{
+  FPGA_SELECT();
-    printf( "%s %08X -> %08X\n", __func__, start, end );
+  FPGA_TX_BYTE(0x60); /* DMA_RANGE */
-    FPGA_SELECT();
+  FPGA_TX_BYTE(start>>8);
-    FPGA_TX_BYTE( FPGA_CMD_SDDMA_RANGE );
+  FPGA_TX_BYTE(start&0xff);
-    FPGA_TX_BYTE( start >> 8 );
+  FPGA_TX_BYTE(end>>8);
-    FPGA_TX_BYTE( start & 0xff );
+  FPGA_TX_BYTE(end&0xff);
-    FPGA_TX_BYTE( end >> 8 );
+//if(tgt==1 && (test=FPGA_RX_BYTE()) != 0x41) printf("!!!!!!!!!!!!!!! -%02x- \n", test);
-    FPGA_TX_BYTE( end & 0xff );
+  FPGA_DESELECT();
-    FPGA_DESELECT();
 }
 
-void fpga_sddma( uint8_t tgt, uint8_t partial )
+void fpga_sddma(uint8_t tgt, uint8_t partial) {
-{
+  uint32_t test = 0;
-    //printf("%s %02X -> %02X\n", __func__, tgt, partial);
+  uint8_t status = 0;
-    //uint32_t test = 0;
+  BITBAND(SD_CLKREG->FIODIR, SD_CLKPIN) = 0;
-    //uint8_t status = 0;
+  FPGA_SELECT();
-    BITBAND( SD_CLKREG->FIODIR, SD_CLKPIN ) = 0;
+  FPGA_TX_BYTE(0x40 | (tgt & 0x3) | ((partial & 1) << 2) ); /* DO DMA */
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0x00); /* dummy for falling DMA_EN edge */
-    FPGA_TX_BYTE( FPGA_CMD_SDDMA | ( tgt & 3 ) | ( partial ? FPGA_SDDMA_PARTIAL : 0 ) );
+//if(tgt==1 && (test=FPGA_RX_BYTE()) != 0x41) printf("!!!!!!!!!!!!!!! -%02x- \n", test);
-    FPGA_TX_BYTE( 0x00 ); /* dummy for falling DMA_EN edge */
+  FPGA_DESELECT();
-    FPGA_DESELECT();
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0xF1); /* STATUS */
-    FPGA_TX_BYTE( FPGA_CMD_GETSTATUS );
+  FPGA_TX_BYTE(0x00); /* dummy */
-    DBG_SD printf( "FPGA DMA request sent, wait for completion..." );
+  DBG_SD printf("FPGA DMA request sent, wait for completion...");
-
+  while((status=FPGA_RX_BYTE()) & 0x80) {
-    while ( FPGA_RX_BYTE() & 0x80 )
+    FPGA_RX_BYTE(); /* eat the 2nd status byte */
-    {
+    test++;
-        FPGA_RX_BYTE(); /* eat the 2nd status byte */
+  }
-    }
+  DBG_SD printf("...complete\n");
-
+  FPGA_DESELECT();
-    DBG_SD printf( "...complete\n" );
+//  if(test<5)printf("loopy: %ld %02x\n", test, status);
-    FPGA_DESELECT();
+  BITBAND(SD_CLKREG->FIODIR, SD_CLKPIN) = 1;
-    BITBAND( SD_CLKREG->FIODIR, SD_CLKPIN ) = 1;
 }
 
-void dac_play()
+void set_dac_vol(uint8_t volume) {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0x50);
-    FPGA_TX_BYTE( FPGA_CMD_DACPLAY );
+  FPGA_TX_BYTE(volume);
-    FPGA_TX_BYTE( 0x00 ); /* latch reset */
+  FPGA_TX_BYTE(0x00); /* latch rise */
-    FPGA_DESELECT();
+  FPGA_TX_BYTE(0x00); /* latch fall */
+  FPGA_DESELECT();
 }
 
-void dac_pause()
+void dac_play() {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0xe2);
-    FPGA_TX_BYTE( FPGA_CMD_DACPAUSE );
+  FPGA_TX_BYTE(0x00); /* latch reset */
-    FPGA_TX_BYTE( 0x00 ); /* latch reset */
+  FPGA_DESELECT();
-    FPGA_DESELECT();
 }
 
-void dac_reset()
+void dac_pause() {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0xe1);
-    FPGA_TX_BYTE( FPGA_CMD_DACRESETPTR );
+  FPGA_TX_BYTE(0x00); /* latch reset */
-    FPGA_TX_BYTE( 0x00 ); /* latch reset */
+  FPGA_DESELECT();
-    FPGA_TX_BYTE( 0x00 ); /* latch reset */
-    FPGA_DESELECT();
 }
 
-void msu_reset( uint16_t address )
+void dac_reset() {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0xe3);
-    FPGA_TX_BYTE( FPGA_CMD_MSUSETPTR );
+  FPGA_TX_BYTE(0x00); /* latch reset */
-    FPGA_TX_BYTE( ( address >> 8 ) & 0xff ); /* address hi */
+  FPGA_TX_BYTE(0x00); /* latch reset */
-    FPGA_TX_BYTE( address & 0xff );    /* address lo */
+  FPGA_DESELECT();
-    FPGA_TX_BYTE( 0x00 );              /* latch reset */
-    FPGA_TX_BYTE( 0x00 );              /* latch reset */
-    FPGA_DESELECT();
 }
 
-void set_msu_status( uint8_t set, uint8_t reset )
+void msu_reset(uint16_t address) {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0xe4);
-    FPGA_TX_BYTE( FPGA_CMD_MSUSETBITS );
+  FPGA_TX_BYTE((address>>8) & 0xff); /* address hi */
-    FPGA_TX_BYTE( set );
+  FPGA_TX_BYTE(address & 0xff);      /* address lo */
-    FPGA_TX_BYTE( reset );
+  FPGA_TX_BYTE(0x00);                /* latch reset */
-    FPGA_TX_BYTE( 0x00 ); /* latch reset */
+  FPGA_TX_BYTE(0x00);                /* latch reset */
-    FPGA_DESELECT();
+  FPGA_DESELECT();
 }
 
-uint16_t get_msu_track()
+void set_msu_status(uint8_t set, uint8_t reset) {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0xe0);
-    FPGA_TX_BYTE( FPGA_CMD_MSUGETTRACK );
+  FPGA_TX_BYTE(set);
-    uint16_t result = ( FPGA_RX_BYTE() ) << 8;
+  FPGA_TX_BYTE(reset);
-    result |= FPGA_RX_BYTE();
+  FPGA_TX_BYTE(0x00); /* latch reset */
-    FPGA_DESELECT();
+  FPGA_DESELECT();
-    return result;
 }
 
-uint32_t get_msu_offset()
+uint8_t get_msu_volume() {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0xF4); /* MSU_VOLUME */
-    FPGA_TX_BYTE( FPGA_CMD_MSUGETADDR );
+  FPGA_TX_BYTE(0x00); /* dummy */
-    uint32_t result = ( FPGA_RX_BYTE() ) << 24;
+  uint8_t result = FPGA_RX_BYTE();
-    result |= ( FPGA_RX_BYTE() ) << 16;
+  FPGA_DESELECT();
-    result |= ( FPGA_RX_BYTE() ) << 8;
+  return result;
-    result |= ( FPGA_RX_BYTE() );
-    FPGA_DESELECT();
-    return result;
 }
 
-uint32_t get_snes_sysclk()
+uint16_t get_msu_track() {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0xF3); /* MSU_TRACK */
-    FPGA_TX_BYTE( FPGA_CMD_GETSYSCLK );
+  FPGA_TX_BYTE(0x00); /* dummy */
-    FPGA_TX_BYTE( 0x00 ); /* dummy (copy current sysclk count to register) */
+  uint16_t result = (FPGA_RX_BYTE()) << 8;
-    uint32_t result = ( FPGA_RX_BYTE() ) << 24;
+  result |= FPGA_RX_BYTE();
-    result |= ( FPGA_RX_BYTE() ) << 16;
+  FPGA_DESELECT();
-    result |= ( FPGA_RX_BYTE() ) << 8;
+  return result;
-    result |= ( FPGA_RX_BYTE() );
-    FPGA_DESELECT();
-    return result;
 }
 
-void set_bsx_regs( uint8_t set, uint8_t reset )
+uint32_t get_msu_offset() {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0xF2); /* MSU_OFFSET */
-    FPGA_TX_BYTE( FPGA_CMD_BSXSETBITS );
+  FPGA_TX_BYTE(0x00); /* dummy */
-    FPGA_TX_BYTE( set );
+  uint32_t result = (FPGA_RX_BYTE()) << 24;
-    FPGA_TX_BYTE( reset );
+  result |= (FPGA_RX_BYTE()) << 16;
-    FPGA_TX_BYTE( 0x00 ); /* latch reset */
+  result |= (FPGA_RX_BYTE()) << 8;
-    FPGA_DESELECT();
+  result |= (FPGA_RX_BYTE());
+  FPGA_DESELECT();
+  return result;
 }
 
-void set_fpga_time( uint64_t time )
+uint32_t get_snes_sysclk() {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0xFE); /* GET_SYSCLK */
-    FPGA_TX_BYTE( FPGA_CMD_RTCSET );
+  FPGA_TX_BYTE(0x00); /* dummy */
-    FPGA_TX_BYTE( ( time >> 48 ) & 0xff );
+  FPGA_TX_BYTE(0x00); /* dummy */
-    FPGA_TX_BYTE( ( time >> 40 ) & 0xff );
+  uint32_t result = (FPGA_RX_BYTE()) << 24;
-    FPGA_TX_BYTE( ( time >> 32 ) & 0xff );
+  result |= (FPGA_RX_BYTE()) << 16;
-    FPGA_TX_BYTE( ( time >> 24 ) & 0xff );
+  result |= (FPGA_RX_BYTE()) << 8;
-    FPGA_TX_BYTE( ( time >> 16 ) & 0xff );
+  result |= (FPGA_RX_BYTE());
-    FPGA_TX_BYTE( ( time >> 8 ) & 0xff );
+  FPGA_DESELECT();
-    FPGA_TX_BYTE( time & 0xff );
+  return result;
-    FPGA_TX_BYTE( 0x00 );
-    FPGA_DESELECT();
 }
 
-void fpga_reset_srtc_state()
+void set_bsx_regs(uint8_t set, uint8_t reset) {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0xe6);
-    FPGA_TX_BYTE( FPGA_CMD_SRTCRESET );
+  FPGA_TX_BYTE(set);
-    FPGA_TX_BYTE( 0x00 );
+  FPGA_TX_BYTE(reset);
-    FPGA_TX_BYTE( 0x00 );
+  FPGA_TX_BYTE(0x00); /* latch reset */
-    FPGA_DESELECT();
+  FPGA_DESELECT();
 }
 
-void fpga_reset_dspx_addr()
+void set_fpga_time(uint64_t time) {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0xe5);
-    FPGA_TX_BYTE( FPGA_CMD_DSPRESETPTR );
+  FPGA_TX_BYTE((time >> 48) & 0xff);
-    FPGA_TX_BYTE( 0x00 );
+  FPGA_TX_BYTE((time >> 40) & 0xff);
-    FPGA_TX_BYTE( 0x00 );
+  FPGA_TX_BYTE((time >> 32) & 0xff);
-    FPGA_DESELECT();
+  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_write_dspx_pgm( uint32_t data )
+void fpga_reset_srtc_state() {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0xe7);
-    FPGA_TX_BYTE( FPGA_CMD_DSPWRITEPGM );
+  FPGA_TX_BYTE(0x00);
-    FPGA_TX_BYTE( ( data >> 16 ) & 0xff );
+  FPGA_TX_BYTE(0x00);
-    FPGA_TX_BYTE( ( data >> 8 ) & 0xff );
+  FPGA_DESELECT();
-    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_reset_dspx_addr() {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0xe8);
-    FPGA_TX_BYTE( FPGA_CMD_DSPWRITEDAT );
+  FPGA_TX_BYTE(0x00);
-    FPGA_TX_BYTE( ( data >> 8 ) & 0xff );
+  FPGA_TX_BYTE(0x00);
-    FPGA_TX_BYTE( ( data ) & 0xff );
+  FPGA_DESELECT();
-    FPGA_TX_BYTE( 0x00 );
-    FPGA_TX_BYTE( 0x00 );
-    FPGA_DESELECT();
 }
 
-void fpga_dspx_reset( uint8_t reset )
+void fpga_write_dspx_pgm(uint32_t data) {
-{
+  FPGA_SELECT();
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0xe9);
-    FPGA_TX_BYTE( reset ? FPGA_CMD_DSPRESET : FPGA_CMD_DSPUNRESET );
+  FPGA_TX_BYTE((data>>16)&0xff);
-    FPGA_TX_BYTE( 0x00 );
+  FPGA_TX_BYTE((data>>8)&0xff);
-    FPGA_DESELECT();
+  FPGA_TX_BYTE((data)&0xff);
+  FPGA_TX_BYTE(0x00);
+  FPGA_TX_BYTE(0x00);
+  FPGA_DESELECT();
 }
 
-void fpga_set_features( uint8_t feat )
+void fpga_write_dspx_dat(uint16_t data) {
-{
+  FPGA_SELECT();
-    printf( "set features: %02x\n", feat );
+  FPGA_TX_BYTE(0xea);
-    FPGA_SELECT();
+  FPGA_TX_BYTE((data>>8)&0xff);
-    FPGA_TX_BYTE( FPGA_CMD_SETFEATURE );
+  FPGA_TX_BYTE((data)&0xff);
-    FPGA_TX_BYTE( feat );
+  FPGA_TX_BYTE(0x00);
-    FPGA_DESELECT();
+  FPGA_TX_BYTE(0x00);
+  FPGA_DESELECT();
 }
 
-void fpga_set_213f( uint8_t data )
+void fpga_dspx_reset(uint8_t reset) {
-{
+  FPGA_SELECT();
-    printf( "set 213f: %d\n", data );
+  FPGA_TX_BYTE(reset ? 0xeb : 0xec);
-    FPGA_SELECT();
+  FPGA_TX_BYTE(0x00);
-    FPGA_TX_BYTE( FPGA_CMD_SET213F );
+  FPGA_DESELECT();
-    FPGA_TX_BYTE( data );
+}
-    FPGA_DESELECT();
+
+void fpga_set_features(uint8_t feat) {
+  printf("set features: %02x\n", feat);
+  FPGA_SELECT();
+  FPGA_TX_BYTE(0xed);
+  FPGA_TX_BYTE(feat);
+  FPGA_DESELECT();
+}
+
+void fpga_set_213f(uint8_t data) {
+  printf("set 213f: %d\n", data);
+  FPGA_SELECT();
+  FPGA_TX_BYTE(0xee);
+  FPGA_TX_BYTE(data);
+  FPGA_DESELECT();
 }
 

src/fpga_spi.h

@@ -32,13 +32,13 @@
 #include "spi.h"
 #include "config.h"
 
-#define FPGA_SS_BIT 16
+#define FPGA_SS_BIT	16
-#define FPGA_SS_REG LPC_GPIO0
+#define FPGA_SS_REG	LPC_GPIO0
 
-#define FPGA_SELECT()   do {FPGA_TX_SYNC(); BITBAND(FPGA_SS_REG->FIOCLR, FPGA_SS_BIT) = 1;} while (0)
+#define FPGA_SELECT()	do {FPGA_TX_SYNC(); BITBAND(FPGA_SS_REG->FIOCLR, FPGA_SS_BIT) = 1;} while (0)
-#define FPGA_SELECT_ASYNC() do {BITBAND(FPGA_SS_REG->FIOCLR, FPGA_SS_BIT) = 1;} while (0)
+#define FPGA_SELECT_ASYNC()	do {BITBAND(FPGA_SS_REG->FIOCLR, FPGA_SS_BIT) = 1;} while (0)
-#define FPGA_DESELECT() do {FPGA_TX_SYNC(); BITBAND(FPGA_SS_REG->FIOSET, FPGA_SS_BIT) = 1;} while (0)
+#define FPGA_DESELECT()	do {FPGA_TX_SYNC(); BITBAND(FPGA_SS_REG->FIOSET, FPGA_SS_BIT) = 1;} while (0)
-#define FPGA_DESELECT_ASYNC()   do {BITBAND(FPGA_SS_REG->FIOSET, FPGA_SS_BIT) = 1;} while (0)
+#define FPGA_DESELECT_ASYNC()	do {BITBAND(FPGA_SS_REG->FIOSET, FPGA_SS_BIT) = 1;} while (0)
 
 #define FPGA_TX_SYNC()     spi_tx_sync()
 #define FPGA_TX_BYTE(x)    spi_tx_byte(x)
@@ -47,6 +47,9 @@
 #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)
@@ -57,73 +60,37 @@
 
 #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)
 
-/* command parameters */
+void fpga_spi_init(void);
-#define FPGA_MEM_AUTOINC        (0x8)
+uint8_t fpga_test(void);
-#define FPGA_SDDMA_PARTIAL      (0x4)
+uint16_t fpga_status(void);
-#define FPGA_TGT_MEM      (0x0)
+void spi_fpga(void);
-#define FPGA_TGT_DACBUF   (0x1)
+void spi_sd(void);
-#define FPGA_TGT_MSUBUF   (0x2)
+void spi_none(void);
-
+void set_mcu_addr(uint32_t);
-/* commands */
+void set_dac_addr(uint16_t);
-#define FPGA_CMD_SETADDR        (0x00)
+void set_dac_vol(uint8_t);
-#define FPGA_CMD_SETROMMASK     (0x10)
+void dac_play(void);
-#define FPGA_CMD_SETRAMMASK     (0x20)
+void dac_pause(void);
-#define FPGA_CMD_SETMAPPER(x)   (0x30 | (x & 15))
+void dac_reset(void);
-#define FPGA_CMD_SDDMA          (0x40)
+void msu_reset(uint16_t);
-#define FPGA_CMD_SDDMA_RANGE    (0x60)
+void set_msu_addr(uint16_t);
-#define FPGA_CMD_READMEM        (0x80)
+void set_msu_status(uint8_t set, uint8_t reset);
-#define FPGA_CMD_WRITEMEM       (0x90)
+void set_saveram_mask(uint32_t);
-#define FPGA_CMD_MSUSETBITS     (0xe0)
+void set_rom_mask(uint32_t);
-#define FPGA_CMD_DACPAUSE       (0xe1)
+void set_mapper(uint8_t val);
-#define FPGA_CMD_DACPLAY        (0xe2)
+void fpga_sddma(uint8_t tgt, uint8_t partial);
-#define FPGA_CMD_DACRESETPTR    (0xe3)
+void fpga_set_sddma_range(uint16_t start, uint16_t end);
-#define FPGA_CMD_MSUSETPTR      (0xe4)
+uint8_t get_msu_volume(void);
-#define FPGA_CMD_RTCSET         (0xe5)
+uint16_t get_msu_track(void);
-#define FPGA_CMD_BSXSETBITS     (0xe6)
+uint32_t get_msu_offset(void);
-#define FPGA_CMD_SRTCRESET      (0xe7)
+uint32_t get_snes_sysclk(void);
-#define FPGA_CMD_DSPRESETPTR    (0xe8)
+void set_bsx_regs(uint8_t set, uint8_t reset);
-#define FPGA_CMD_DSPWRITEPGM    (0xe9)
+void set_fpga_time(uint64_t time);
-#define FPGA_CMD_DSPWRITEDAT    (0xea)
+void fpga_reset_srtc_state(void);
-#define FPGA_CMD_DSPRESET       (0xeb)
+void fpga_reset_dspx_addr(void);
-#define FPGA_CMD_DSPUNRESET     (0xec)
+void fpga_write_dspx_pgm(uint32_t data);
-#define FPGA_CMD_SETFEATURE     (0xed)
+void fpga_write_dspx_dat(uint16_t data);
-#define FPGA_CMD_SET213F        (0xee)
+void fpga_dspx_reset(uint8_t reset);
-#define FPGA_CMD_TEST           (0xf0)
+void fpga_set_features(uint8_t feat);
-#define FPGA_CMD_GETSTATUS      (0xf1)
+void fpga_set_213f(uint8_t data);
-#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,15 +4,12 @@
 #include "sdnative.h"
 #include "uart.h"
 
-void EINT3_IRQHandler( void )
+void EINT3_IRQHandler(void) {
-{
+  NVIC_ClearPendingIRQ(EINT3_IRQn);
-    NVIC_ClearPendingIRQ( EINT3_IRQn );
+  if(SD_CHANGE_DETECT) {
-
+    SD_CHANGE_CLR();
-    if ( SD_CHANGE_DETECT )
+    sdn_changed();
-    {
+  }
-        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,156 +22,127 @@ int led_pwmstate = 0;
    write  red    P1.23 PWM1[4]
 */
 
-void rdyled( unsigned int state )
+void rdyled(unsigned int state) {
-{
+  if(led_pwmstate) {
-    if ( led_pwmstate )
+    rdybright(state?15:0);
-    {
+  } else {
-        rdybright( state ? 15 : 0 );
+    BITBAND(LPC_GPIO2->FIODIR, 4) = state;
-    }
+  }
-    else
+  led_rdyledstate = state;
-    {
-        BITBAND( LPC_GPIO2->FIODIR, 4 ) = state;
-    }
-
-    led_rdyledstate = state;
 }
 
-void readled( unsigned int state )
+void readled(unsigned int state) {
-{
+  if(led_pwmstate) {
-    if ( led_pwmstate )
+    readbright(state?15:0);
-    {
+  } else {
-        readbright( state ? 15 : 0 );
+    BITBAND(LPC_GPIO2->FIODIR, 5) = state;
-    }
+  }
-    else
+  led_readledstate = state;
-    {
-        BITBAND( LPC_GPIO2->FIODIR, 5 ) = state;
-    }
-
-    led_readledstate = state;
 }
 
-void writeled( unsigned int state )
+void writeled(unsigned int state) {
-{
+  if(led_pwmstate) {
-    if ( led_pwmstate )
+    writebright(state?15:0);
-    {
+  } else {
-        writebright( state ? 15 : 0 );
+    BITBAND(LPC_GPIO1->FIODIR, 23) = state;
-    }
+  }
-    else
+  led_writeledstate = state;
-    {
-        BITBAND( LPC_GPIO1->FIODIR, 23 ) = state;
-    }
-
-    led_writeledstate = state;
 }
 
-void rdybright( uint8_t bright )
+void rdybright(uint8_t bright) {
-{
+  LPC_PWM1->MR5 = led_bright[(bright & 15)];
-    LPC_PWM1->MR5 = led_bright[( bright & 15 )];
+  BITBAND(LPC_PWM1->LER, 5) = 1;
-    BITBAND( LPC_PWM1->LER, 5 ) = 1;
 }
-void readbright( uint8_t bright )
+void readbright(uint8_t bright) {
-{
+  LPC_PWM1->MR6 = led_bright[(bright & 15)];
-    LPC_PWM1->MR6 = led_bright[( bright & 15 )];
+  BITBAND(LPC_PWM1->LER, 6) = 1;
-    BITBAND( LPC_PWM1->LER, 6 ) = 1;
 }
-void writebright( uint8_t bright )
+void writebright(uint8_t bright) {
-{
+  LPC_PWM1->MR4 = led_bright[(bright & 15)];
-    LPC_PWM1->MR4 = led_bright[( bright & 15 )];
+  BITBAND(LPC_PWM1->LER, 4) = 1;
-    BITBAND( LPC_PWM1->LER, 4 ) = 1;
 }
 
-void led_clkout32( uint32_t val )
+void led_clkout32(uint32_t val) {
-{
+  while(1) {
-    while ( 1 )
+    rdyled(1);
-    {
+    delay_ms(400);
-        rdyled( 1 );
+    readled((val & BV(31))>>31);
-        delay_ms( 400 );
+    rdyled(0);
-        readled( ( val & BV( 31 ) ) >> 31 );
+    val<<=1;
-        rdyled( 0 );
+    delay_ms(400);
-        val <<= 1;
+  }
-        delay_ms( 400 );
-    }
 }
 
-void toggle_rdy_led()
+void toggle_rdy_led() {
-{
+  rdyled(~led_rdyledstate);
-    rdyled( ~led_rdyledstate );
 }
 
-void toggle_read_led()
+void toggle_read_led() {
-{
+  readled(~led_readledstate);
-    readled( ~led_readledstate );
 }
 
-void toggle_write_led()
+void toggle_write_led() {
-{
+  writeled(~led_writeledstate);
-    writeled( ~led_writeledstate );
 }
 
-void led_panic()
+void led_panic() {
-{
+  led_std();
-    led_std();
+  while(1) {
-
+    rdyled(1);
-    while ( 1 )
+    readled(1);
-    {
+    writeled(1);
-        rdyled( 1 );
+    delay_ms(100);
-        readled( 1 );
+    rdyled(0);
-        writeled( 1 );
+    readled(0);
-        delay_ms( 100 );
+    writeled(0);
-        rdyled( 0 );
+    delay_ms(100);
-        readled( 0 );
+    cli_entrycheck();
-        writeled( 0 );
+  }
-        delay_ms( 100 );
-        cli_entrycheck();
-    }
 }
 
-void led_pwm()
+void led_pwm() {
-{
+/* Rev.C P2.4, P2.5, P1.23 */
-    /* Rev.C P2.4, P2.5, P1.23 */
+  BITBAND(LPC_PINCON->PINSEL4, 9) = 0;
-    BITBAND( LPC_PINCON->PINSEL4, 9 ) = 0;
+  BITBAND(LPC_PINCON->PINSEL4, 8) = 1;
-    BITBAND( LPC_PINCON->PINSEL4, 8 ) = 1;
 
-    BITBAND( LPC_PINCON->PINSEL4, 11 ) = 0;
+  BITBAND(LPC_PINCON->PINSEL4, 11) = 0;
-    BITBAND( LPC_PINCON->PINSEL4, 10 ) = 1;
+  BITBAND(LPC_PINCON->PINSEL4, 10) = 1;
 
-    BITBAND( LPC_PINCON->PINSEL3, 15 ) = 1;
+  BITBAND(LPC_PINCON->PINSEL3, 15) = 1;
-    BITBAND( LPC_PINCON->PINSEL3, 14 ) = 0;
+  BITBAND(LPC_PINCON->PINSEL3, 14) = 0;
 
-    BITBAND( LPC_PWM1->PCR, 12 ) = 1;
+  BITBAND(LPC_PWM1->PCR, 12) = 1;
-    BITBAND( LPC_PWM1->PCR, 13 ) = 1;
+  BITBAND(LPC_PWM1->PCR, 13) = 1;
-    BITBAND( LPC_PWM1->PCR, 14 ) = 1;
+  BITBAND(LPC_PWM1->PCR, 14) = 1;
 
-    led_pwmstate = 1;
+  led_pwmstate = 1;
 }
 
-void led_std()
+void led_std() {
-{
+  BITBAND(LPC_PINCON->PINSEL4, 9) = 0;
-    BITBAND( LPC_PINCON->PINSEL4, 9 ) = 0;
+  BITBAND(LPC_PINCON->PINSEL4, 8) = 0;
-    BITBAND( LPC_PINCON->PINSEL4, 8 ) = 0;
 
-    BITBAND( LPC_PINCON->PINSEL4, 11 ) = 0;
+  BITBAND(LPC_PINCON->PINSEL4, 11) = 0;
-    BITBAND( LPC_PINCON->PINSEL4, 10 ) = 0;
+  BITBAND(LPC_PINCON->PINSEL4, 10) = 0;
 
-    BITBAND( LPC_PINCON->PINSEL3, 15 ) = 0;
+  BITBAND(LPC_PINCON->PINSEL3, 15) = 0;
-    BITBAND( LPC_PINCON->PINSEL3, 14 ) = 0;
+  BITBAND(LPC_PINCON->PINSEL3, 14) = 0;
 
-    BITBAND( LPC_PWM1->PCR, 12 ) = 0;
+  BITBAND(LPC_PWM1->PCR, 12) = 0;
-    BITBAND( LPC_PWM1->PCR, 13 ) = 0;
+  BITBAND(LPC_PWM1->PCR, 13) = 0;
-    BITBAND( LPC_PWM1->PCR, 14 ) = 0;
+  BITBAND(LPC_PWM1->PCR, 14) = 0;
 
-    led_pwmstate = 0;
+  led_pwmstate = 0;
 }
 
-void led_init()
+void led_init() {
-{
+/* power is already connected by default */
-    /* power is already connected by default */
+/* set PCLK divider to 8 */
-    /* set PCLK divider to 8 */
+  BITBAND(LPC_SC->PCLKSEL0, 13) = 1;
-    BITBAND( LPC_SC->PCLKSEL0, 13 ) = 1;
+  BITBAND(LPC_SC->PCLKSEL0, 12) = 1;
-    BITBAND( LPC_SC->PCLKSEL0, 12 ) = 1;
+  LPC_PWM1->MR0 = 255;
-    LPC_PWM1->MR0 = 255;
+  BITBAND(LPC_PWM1->LER, 0) = 1;
-    BITBAND( LPC_PWM1->LER, 0 ) = 1;
+  BITBAND(LPC_PWM1->TCR, 0) = 1;
-    BITBAND( LPC_PWM1->TCR, 0 ) = 1;
+  BITBAND(LPC_PWM1->TCR, 3) = 1;
-    BITBAND( LPC_PWM1->TCR, 3 ) = 1;
+  BITBAND(LPC_PWM1->MCR, 1) = 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
+#adapter_nsrst_delay 200
-#jtag_nsrst_delay 200
+jtag_nsrst_delay 200
 jtag_ntrst_delay 200
 
 # LPC2000 & LPC1700 -> SRST causes TRST
@@ -39,8 +39,7 @@ 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).
@@ -57,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.
-adapter_khz 1000
+jtag_khz 1000
 
 $_TARGETNAME configure -event reset-init {
 	# Do not remap 0x0000-0x0020 to anything but the flash (i.e. select

src/main.c

@@ -29,8 +29,8 @@
 #include "sysinfo.h"
 #include "cfg.h"
 
-#define EMC0TOGGLE  (3<<4)
+#define EMC0TOGGLE	(3<<4)
-#define MR0R    (1<<1)
+#define MR0R		(1<<1)
 
 int i;
 
@@ -48,415 +48,361 @@ extern volatile int reset_changed;
 
 extern volatile cfg_t CFG;
 
-enum system_states
+enum system_states {
-{
+  SYS_RTC_STATUS = 0,
-    SYS_RTC_STATUS = 0,
+  SYS_LAST_STATUS = 1
-    SYS_LAST_STATUS = 1
 };
 
-int main( void )
+int main(void)
 {
-    uint8_t card_go = 0;
+   /* Start by initial configuration, needed in all cases */
-    uint32_t saved_dir_id;
+   LPC_GPIO2->FIODIR = BV(4) | BV(5);
-    uint32_t mem_dir_id;
+   LPC_GPIO1->FIODIR = BV(23) | BV(SNES_CIC_PAIR_BIT);
-    uint32_t mem_magic;
+   BITBAND(SNES_CIC_PAIR_REG->FIOSET, SNES_CIC_PAIR_BIT) = 1;
-    uint8_t cmd = 0;
+   LPC_GPIO0->FIODIR = BV(16);
-    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 );
+   /* connect UART3 on P0[25:26] + SSP0 on P0[15:18] + MAT3.0 on P0[10] */
-    LPC_GPIO1->FIODIR = BV( 23 ) | BV( SNES_CIC_PAIR_BIT );
+   LPC_PINCON->PINSEL1 = BV(18) | BV(19) | BV(20) | BV(21) /* UART3 */
-    BITBAND( SNES_CIC_PAIR_REG->FIOSET, SNES_CIC_PAIR_BIT ) = 1;
+                       | BV(3) | BV(5);                    /* SSP0 (FPGA) except SS */
-    LPC_GPIO0->FIODIR = BV( 16 );
+   LPC_PINCON->PINSEL0 = BV(31);                            /* SSP0 */
+   /*                      | BV(13) | BV(15) | BV(17) | BV(19)  SSP1 (SD) */
 
-    /* connect UART3 on P0[25:26] + SSP0 on P0[15:18] + MAT3.0 on P0[10] */
+   /* pull-down CIC data lines */
-    LPC_PINCON->PINSEL1 = BV( 18 ) | BV( 19 ) | BV( 20 ) | BV( 21 ) /* UART3 */
+   LPC_PINCON->PINMODE0 = BV(0) | BV(1) | BV(2) | BV(3);
-                          | 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 */
+   clock_disconnect();
-    LPC_PINCON->PINMODE0 = BV( 0 ) | BV( 1 ) | BV( 2 ) | BV( 3 );
+   /* First init all SNES functions */
+   snes_init();
+   snes_reset(1); /* Maintain RESET UP, to prevent SNES to start */
 
-    clock_disconnect(); /* Disable clock                */
+   /* Init all other parts */
-    snes_init();        /* Set SNES Reset               */
+   power_init();
-    power_init();       /* Enable power block of LPC    */
+   timer_init();
-    timer_init();       /* Enable internal timer        */
+   uart_init();
-    uart_init();        /* Configure UART               */
+   fpga_spi_init();
-    fpga_spi_init();    /* Configure FPGA_SPI IOs       */
+   spi_preinit();
-    spi_preinit();      /* Initialise SPI IO            */
+   led_init();
-    led_init();         /* Initialise LEDs IO           */
+
+   /* 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();
+
+   /* Banner */
+   printf("\n\nsd2snes mk.2\n============\nfw ver.: " CONFIG_VERSION "\nfwver: %d\ncpu clock: %d Hz\n", CONFIG_FWVER, CONFIG_CPU_FREQUENCY);
+   printf("PCONP=%lx\n", LPC_SC->PCONP);
+
+   file_init();
+   cic_init(0);
+
+   /* FPGA Initialisation */
+   /* setup timer (fpga clk) */
+   LPC_TIM3->CTCR = 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);
+
+   /* Should test SRAM here */
  
 
-    /* do this last because the peripheral init()s change PCLK dividers */
+   while(1)
-    clock_init();
+   {
-    /* Output FPGA clock */
+      if(disk_state == DISK_CHANGED)
-    LPC_PINCON->PINSEL0 |= BV( 20 ) | BV( 21 );              /* MAT3.0 (FPGA clock) */
+      {
+         sdn_init();
+         newcard = 1;
+      }
 
-    led_pwm();      /* Enabke PWM on LED (even if not used...) */
+      load_bootrle(SRAM_MENU_ADDR);
-    sdn_init();     /* SD init */
+      set_saveram_mask(0x1fff);
+      set_rom_mask(0x3fffff);
+      set_mapper(0x7);
       
-    /* Print banner */
+      /* Unlock SNES */
-    printf( "\n\nsd2snes mk.2\n============\nfw ver.: " CONFIG_VERSION "\ncpu clock: %d Hz\n", CONFIG_CPU_FREQUENCY );
+      snes_reset(0);
       
-    /* Init file manager */
+      /* Check CIC status */
-    file_init();
+      while(get_cic_state() == CIC_FAIL)
+      {
+         rdyled(0);
+         readled(0);
+         writeled(0);
+         delay_ms(500);
+         rdyled(1);
+         readled(1);
+         writeled(1);
+         delay_ms(500);
+      }
 
-    /* */
+      fpga_pgm((uint8_t*)"/sd2snes/fpga_base.bit");
-    cic_init( 0 );
+      sram_memtest();
       
-    /* setup timer (fpga clk) */
+      /* some sanity checks */
-    LPC_TIM3->TCR = 2;
+      uint8_t card_go = 0;
-    LPC_TIM3->CTCR = 0;
+      while(!card_go)
-    LPC_TIM3->PR = 0;
+      {
-    LPC_TIM3->EMR = EMC0TOGGLE;
+         if(disk_status(0) & (STA_NOINIT|STA_NODISK))
-    LPC_TIM3->MCR = MR0R;
+         {
-    LPC_TIM3->MR0 = 1;
+	         snes_bootprint("        No SD Card found!       \0");
-    LPC_TIM3->TCR = 1;
+      	   while(disk_status(0) & (STA_NOINIT|STA_NODISK));
+      	   delay_ms(200);
+         }
+         file_open((uint8_t*)"/sd2snes/menu.bin", FA_READ);
       
-    fpga_init();
+         if(file_status != FILE_OK)
-    fpga_rompgm();
+         {
-    sram_writebyte( 0, SRAM_CMD_ADDR );
+         	snes_bootprint("  /sd2snes/menu.bin not found!  \0");
+         	while(disk_status(0) == RES_OK);
+         } 
+         else
+         {
+	         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);
+      }
       
-    while ( 1 ) /* Main loop */
+      rdyled(1);
-    {
+      readled(0);
-        if ( disk_state == DISK_CHANGED )
+      writeled(0);
-        {
-            sdn_init(); /* Reinit SD card */
-            newcard = 1;
-        }
 
-        load_bootrle( SRAM_MENU_ADDR );
+      cfg_load();
-        set_saveram_mask( 0xffff );
+      cfg_save();
-        set_rom_mask( 0x3fffff );
-        set_mapper( 0x7 );
-        snes_reset( 0 );
       
-        while ( get_cic_state() == CIC_FAIL )
+      sram_writebyte(cfg_is_last_game_valid(), SRAM_STATUS_ADDR+SYS_LAST_STATUS);
-        {
+      cfg_get_last_game(file_lfn);
-            rdyled( 0 );
+      sram_writeblock(strrchr((const char*)file_lfn, '/')+1, SRAM_LASTGAME_ADDR, 256);
-            readled( 0 );
-            writeled( 0 );
-            delay_ms( 500 );
-            rdyled( 1 );
-            readled( 1 );
-            writeled( 1 );
-            delay_ms( 500 );
-        }
       
-        /* Wait for valid card inserted */
+      *fs_path=0;
-        card_go = 0;
+      uint32_t saved_dir_id;
+      get_db_id(&saved_dir_id);
 
-        while ( !card_go )
+      uint32_t mem_dir_id = sram_readlong(SRAM_DIRID);
-        {
+      uint32_t mem_magic = sram_readlong(SRAM_SCRATCHPAD);
-            if ( disk_status( 0 ) & ( STA_NOINIT | STA_NODISK ) )
-            {
-                snes_bootprint( "        No SD Card found!       \0" );
       
-                while ( disk_status( 0 ) & ( STA_NOINIT | STA_NODISK ) );
+      printf("mem_magic=%lx mem_dir_id=%lx saved_dir_id=%lx\n", mem_magic, mem_dir_id, saved_dir_id);
       
-                delay_ms( 200 );
+      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);
+         /* 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);
+	         snes_bootprint("     rebuilding database ...    \0");
+	         curr_dir_id = scan_dir(fs_path, NULL, 1, 0);
+         	sram_writeblock(&curr_dir_id, SRAM_DB_ADDR, 4);
+         	uint32_t endaddr, direndaddr;
+         	sram_readblock(&endaddr, SRAM_DB_ADDR+4, 4);
+         	sram_readblock(&direndaddr, SRAM_DB_ADDR+8, 4);
+         	printf("endaddr: 0x%lX dirend: 0x%lX\n", endaddr, direndaddr);
+         	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);
+         }
       
-            file_open( ( uint8_t * )"/sd2snes/menu.bin", FA_READ );
+         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);
+      }
 
-            if ( file_status != FILE_OK )
+#if 1
-            {
+      cli_loop();
-                snes_bootprint( "  /sd2snes/menu.bin not found!  \0" );
+#endif
 
-                while ( disk_status( 0 ) == RES_OK );
+      /* load menu */
-            }
+      fpga_pgm((uint8_t*)"/sd2snes/fpga_base.bit");
-            else
+      fpga_dspx_reset(1);
-            {
-                /* Card found ! */
-                card_go = 1;
-            }
 
-            file_close();
+      uart_putc('(');
-        }
+      load_rom((uint8_t*)"/sd2snes/menu.bin", SRAM_MENU_ADDR, 0);
+      /* force memory size + mapper */
+      set_rom_mask(0x3fffff);
+      set_mapper(0x7);
+      uart_putc(')');
+      uart_putcrlf();
 
-        snes_bootprint( "           Loading ...          \0" );
+      sram_writebyte(0, SRAM_CMD_ADDR);
 
-        if ( get_cic_state() == CIC_PAIR )
+      if((rtc_state = rtc_isvalid()) != RTC_OK)
-        {
+      {
-            printf( "PAIR MODE ENGAGED!\n" );
+         printf("RTC invalid!\n");
-            cic_pair( CIC_NTSC, CIC_NTSC );
+         sram_writebyte(0xff, SRAM_STATUS_ADDR+SYS_RTC_STATUS);
-        }
+         set_bcdtime(0x20110401000000LL);
+         set_fpga_time(0x20110401000000LL);
+         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);
 
-        rdyled( 1 );
+      uint8_t cmd = 0;
-        readled( 0 );
+      uint64_t btime = 0;
-        writeled( 0 );
+      uint32_t filesize=0;
+      sram_writebyte(32, SRAM_CMD_ADDR);
       
-        /* Load user config */
+      printf("test sram\n");
-        cfg_load();
+      while(!sram_reliable()) cli_entrycheck();
-        cfg_save();
       
-        sram_writebyte( cfg_is_last_game_valid(), SRAM_STATUS_ADDR + SYS_LAST_STATUS );
+      printf("ok\n");
 
-        cfg_get_last_game( file_lfn );
+//while(1) {
-        sram_writeblock( strrchr( ( const char * )file_lfn, '/' ) + 1, SRAM_LASTGAME_ADDR, 256 );
+//  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);
 
-        *fs_path = 0;
+      while(!cmd)
+      {
+         cmd=menu_main_loop();
+         printf("cmd: %d\n", cmd);
+         uart_putc('-');
+         switch(cmd)
+         {
+	      case SNES_CMD_LOADROM:
+	         get_selected_name(file_lfn);
+	         printf("Selected name: %s\n", file_lfn);
+            cfg_save_last_game(file_lfn);
+            cfg_set_last_game_valid(1);
+            cfg_save();
+	         filesize = load_rom(file_lfn, SRAM_ROM_ADDR, LOADROM_WITH_SRAM | LOADROM_WITH_RESET);
+	         break;
 
-        get_db_id( &saved_dir_id );
+	      case SNES_CMD_SETRTC:
+            /* get time from RAM */
+            btime = sram_gettime(SRAM_PARAM_ADDR);
+            /* set RTC */
+            set_bcdtime(btime);
+            set_fpga_time(btime);
+	         cmd=0; /* stay in menu loop */
+	         break;
 
-        mem_dir_id = sram_readlong( SRAM_DIRID );
+         case SNES_CMD_SYSINFO:
-        mem_magic = sram_readlong( SRAM_SCRATCHPAD );
+            /* go to sysinfo loop */
+            sysinfo_loop();
+            cmd=0; /* stay in menu loop */
+            break;
 
-        printf( "mem_magic=%lx mem_dir_id=%lx saved_dir_id=%lx\n", mem_magic, mem_dir_id, saved_dir_id );
+         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;
 
-        if ( ( mem_magic != 0x12345678 ) || ( mem_dir_id != saved_dir_id ) || ( newcard ) )
+	      default:
-        {
+	         printf("unknown cmd: %d\n", cmd);
-            newcard = 0;
+	         cmd=0; /* unknown cmd: stay in loop */
-            /* generate fs footprint (interesting files only) */
+	         break;
-            uint32_t curr_dir_id = scan_dir( fs_path, NULL, 0, 0 );
+         }
+      }
       
-            printf( "curr dir id = %lx\n", curr_dir_id );
+      printf("cmd was %x, going to snes main loop\n", cmd);
 
-            /* files changed or no database found? */
+      if(romprops.has_msu1 && msu1_loop())
-            if ( ( get_db_id( &saved_dir_id ) != FR_OK ) || saved_dir_id != curr_dir_id )
+      {
-            {
+         prepare_reset();
-                uint32_t endaddr, direndaddr;
+         continue;
-                /* 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" );
-            }
-            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_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( ')' );
-        uart_putcrlf();
-
-        sram_writebyte( 0, SRAM_CMD_ADDR );
-
-        snes_bootprint( "    same card, loading db...     \n" );
-
-
-        if ( ( rtc_state = rtc_isvalid() ) != RTC_OK )
-        {
-            printf( "RTC invalid!\n" );
-            sram_writebyte( 0xff, SRAM_STATUS_ADDR + SYS_RTC_STATUS );
-            set_bcdtime( 0x20120701000000LL );
-            set_fpga_time( 0x20120701000000LL );
-            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 );
-        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 );
-
-            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 );
-                cfg_save();
-                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 );
-                /* set RTC */
-                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 */
-                break;
-
-            case SNES_CMD_LOADSPC:
-                /* load SPC file */
-                get_selected_name( file_lfn );
-                printf( "Selected name: %s\n", file_lfn );
-                filesize = load_spc( file_lfn, SRAM_SPC_DATA_ADDR, SRAM_SPC_HEADER_ADDR );
-                cmd = 0; /* stay in menu loop */
-                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() );
 
+      cmd=0;
+      uint8_t snes_reset_prev=0, snes_reset_now=0, snes_reset_state=0;
+      uint16_t reset_count=0;
+      while(fpga_test() == FPGA_TEST_TOKEN)
+      {
+         cli_entrycheck();
+         sleep_ms(250);
+         sram_reliable();
+         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;
+	         }
+         }
+         if(snes_reset_state)
+         {
+         	reset_count++;
+         }
+         else
+         {
+	         sram_reliable();
+	         snes_main_loop();
+         }
+         if(reset_count>4)
+         {
+	         reset_count=0;
             prepare_reset();
-            continue;
+	         break;
-        }
+         }
+         snes_reset_prev = snes_reset_now;
+      }
 
-        cmd = 0;
+      /* fpga test fail: panic */
-        snes_reset_prev = 0;
+      if(fpga_test() != FPGA_TEST_TOKEN)
-        snes_reset_now = 0;
+      {
-        snes_reset_state = 0;
+         led_panic();
-        reset_count = 0;
+      }
-
+      /* else reset */
-        while ( fpga_test() == FPGA_TEST_TOKEN )
+   }
-        {
-            cli_entrycheck();
-            sleep_ms( 250 );
-            sram_reliable();
-            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;
-                }
-            }
-
-            if ( snes_reset_state )
-            {
-                reset_count++;
-            }
-            else
-            {
-                sram_reliable();
-                snes_main_loop();
-            }
-
-            if ( reset_count > 4 )
-            {
-                reset_count = 0;
-                prepare_reset();
-                break;
-            }
-
-            snes_reset_prev = snes_reset_now;
-        }
-
-        /* fpga test fail: panic */
-        if ( fpga_test() != FPGA_TEST_TOKEN )
-        {
-            led_panic();
-        }
-
-        /* else reset */
-    }
 }
 

src/memory.h

@@ -30,74 +30,47 @@
 #include <arm/NXP/LPC17xx/LPC17xx.h>
 #include "smc.h"
 
-#define MASK_BITS                (0x000000)
+#define SRAM_ROM_ADDR           (0x000000L)
-#if 0
+#define SRAM_SAVE_ADDR          (0xE00000L)
-#define SRAM_ROM_ADDR           ((0x000000L) & ~MASK_BITS)
-#define SRAM_SAVE_ADDR          ((0x400000L) & ~MASK_BITS)
 
-#define SRAM_MENU_ADDR          ((0x7A0000L) & ~MASK_BITS)
+#define SRAM_MENU_ADDR          (0xE00000L)
-#define SRAM_DIR_ADDR           ((0x410000L) & ~MASK_BITS)
+#define SRAM_DB_ADDR            (0xE40000L)
-#define SRAM_DB_ADDR            ((0x420000L) & ~MASK_BITS)
+#define SRAM_DIR_ADDR           (0xE10000L)
-
+#define SRAM_CMD_ADDR           (0xFF1000L)
-#define SRAM_SPC_DATA_ADDR      ((0x430000L) & ~MASK_BITS)
+#define SRAM_PARAM_ADDR         (0xFF1004L)
-#define SRAM_SPC_HEADER_ADDR    ((0x440000L) & ~MASK_BITS)
+#define SRAM_STATUS_ADDR        (0xFF1100L)
-
+#define SRAM_SYSINFO_ADDR       (0xFF1200L)
-#define SRAM_MENU_SAVE_ADDR     ((0x7F0000L) & ~MASK_BITS)
+#define SRAM_LASTGAME_ADDR      (0xFF1420L)
-#define SRAM_CMD_ADDR           ((0x7F1000L) & ~MASK_BITS)
+#define SRAM_MENU_SAVE_ADDR     (0xFF0000L)
-#define SRAM_PARAM_ADDR         ((0x7F1004L) & ~MASK_BITS)
+#define SRAM_SCRATCHPAD         (0xFFFF00L)
-#define SRAM_STATUS_ADDR        ((0x7F1100L) & ~MASK_BITS)
+#define SRAM_DIRID              (0xFFFFF0L)
-#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 LOADROM_WITH_SRAM	(1)
-#define SRAM_DIR_ADDR           ((0x510000L) & ~MASK_BITS)
+#define LOADROM_WITH_RESET	(2)
-#define SRAM_DB_ADDR            ((0x580000L) & ~MASK_BITS)
 
-#define SRAM_SPC_DATA_ADDR      ((0x7D0000L) & ~MASK_BITS)
+uint32_t load_rom(uint8_t* filename, uint32_t base_addr, uint8_t flags);
-#define SRAM_SPC_HEADER_ADDR    ((0x7E0000L) & ~MASK_BITS)
+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);
+
+uint8_t sram_memtest(void);
 
-#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_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,364 +13,256 @@
 #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;
 
-enum msu_reset_state { MSU_RESET_NONE = 0, MSU_RESET_SHORT, MSU_RESET_LONG };
+int msu1_check_reset(void) {
+  static tick_t rising_ticks;
 
-void prepare_audio_track( uint16_t msu_track )
+  static uint8_t resbutton=0, resbutton_prev=0;
-{
+  resbutton = get_snes_reset();
-    /* open file, fill buffer */
+  if(resbutton && !resbutton_prev) { /* push */
-    char suffix[11];
+    rising_ticks = getticks();
-    f_close( &file_handle );
+  } else if(resbutton && resbutton_prev) { /* hold */
-    snprintf( suffix, sizeof( suffix ), "-%d.pcm", msu_track );
+    if(getticks() > rising_ticks + 99) {
-    strcpy( ( char * )file_buf, ( char * )file_lfn );
+      return 1;
-    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;
 }
 
-void prepare_data( uint32_t msu_offset )
+int msu1_check(uint8_t* filename) {
-{
+/* open MSU file */
-    DBG_MSU1 printf( "Data requested! Offset=%08lx page1=%08lx page2=%08lx\n", msu_offset, msu_page1_start,
+  strcpy((char*)file_buf, (char*)filename);
-                     msu_page2_start );
+  strcpy(strrchr((char*)file_buf, (int)'.'), ".msu");
-
+  printf("MSU datafile: %s\n", file_buf);
-    if (   ( ( msu_offset < msu_page1_start )
+  if(f_open(&msufile, (const TCHAR*)file_buf, FA_READ) != FR_OK) {
-             || ( msu_offset >= msu_page1_start + msu_page_size ) )
+    printf("MSU datafile not found\n");
-            && ( ( 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" );
-    }
-
-    romprops.fpga_features |= FEAT_MSU1;
-    return 1;
-}
-
-int msu1_loop()
-{
-    /* it is assumed that the MSU file is already opened by calling msu1_check(). */
-    while ( fpga_status() & 0x4000 );
-
-    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;
-    fpga_status_prev = fpga_status();
-    fpga_status_now = fpga_status();
-    int msu_res;
-
-    /*  set_msu_addr(0x0);
-      msu_reset(0x0);
-      ff_sd_offload=1;
-      sd_offload_tgt=2;
-      f_lseek(&msufile, 0L);
-      ff_sd_offload=1;
-      sd_offload_tgt=2;
-      f_read(&msufile, file_buf, 16384, &msu_data_bytes_read);
-    */
-    set_dac_addr( dac_addr );
-    dac_pause();
-    dac_reset();
-
-    set_msu_addr( 0x0 );
-    msu_reset( 0x0 );
-    ff_sd_offload = 1;
-    sd_offload_tgt = 2;
-    f_lseek( &msufile, 0L );
-    ff_sd_offload = 1;
-    sd_offload_tgt = 2;
-    f_read( &msufile, file_buf, 16384, &msu_data_bytes_read );
-
-    prepare_audio_track( 0 );
-    prepare_data( 0 );
-
-    /* audio_start, data_start, 0, audio_ctrl[1:0], ctrl_start */
-    while ( ( msu_res = msu1_check_reset() ) == MSU_RESET_NONE )
-    {
-        cli_entrycheck();
-        fpga_status_now = fpga_status();
-
-        /* Data buffer refill */
-        if ( ( fpga_status_now & 0x2000 ) != ( fpga_status_prev & 0x2000 ) )
-        {
-            DBG_MSU1 printf( "data\n" );
-
-            if ( fpga_status_now & 0x2000 )
-            {
-                msu_addr = 0x0;
-                msu_page1_start = msu_page2_start + msu_page_size;
-            }
-            else
-            {
-                msu_addr = 0x2000;
-                msu_page2_start = msu_page1_start + msu_page_size;
-            }
-
-            set_msu_addr( msu_addr );
-            sd_offload_tgt = 2;
-            ff_sd_offload = 1;
-            msu_res = f_read( &msufile, file_buf, 8192, &msu_data_bytes_read );
-            DBG_MSU1 printf( "data buffer refilled. res=%d page1=%08lx page2=%08lx\n", msu_res, msu_page1_start, msu_page2_start );
-        }
-
-        /* Audio buffer refill */
-        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, &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 );
-
-            prepare_audio_track( msu_track );
-        }
-
-        if ( fpga_status_now & 0x0010 )
-        {
-            /* get address */
-            msu_offset = get_msu_offset();
-            prepare_data( msu_offset );
-        }
-
-        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
-            {
-                msu_repeat = 0;
-                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 */
-                dac_play();
-            }
-            else
-            {
-                DBG_MSU1 printf( "PAUSE!\n" );
-                set_msu_status( 0x00, 0x03 ); /* set no bits, reset bit 1+0 */
-                dac_pause();
-            }
-        }
-
-        fpga_status_prev = fpga_status_now;
-
-        /* handle loop / end */
-        if ( msu_audio_bytes_read < MSU_DAC_BUFSIZE / 2 )
-        {
-            ff_sd_offload = 0;
-            sd_offload = 0;
-
-            if ( msu_repeat )
-            {
-                DBG_MSU1 printf( "loop\n" );
-                ff_sd_offload = 1;
-                sd_offload_tgt = 1;
-                f_lseek( &file_handle, 8L + msu_loop_point * 4 );
-                ff_sd_offload = 1;
-                sd_offload_tgt = 1;
-                f_read( &file_handle, file_buf, ( MSU_DAC_BUFSIZE / 2 ) - msu_audio_bytes_read, &msu_audio_bytes_read );
-            }
-            else
-            {
-                set_msu_status( 0x00, 0x02 ); /* clear play bit */
-                dac_pause();
-            }
-
-            msu_audio_bytes_read = MSU_DAC_BUFSIZE;
-        }
-    }
-
-    f_close( &file_handle );
-    DBG_MSU1 printf( "Reset " );
-
-    if ( msu_res == MSU_RESET_LONG )
-    {
-        f_close( &msufile );
-        DBG_MSU1 printf( "to menu\n" );
-        return 1;
-    }
-
-    DBG_MSU1 printf( "game\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");
+  }
+  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();
+  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;
+
+  uint32_t msu_page1_start = 0x0000;
+  uint32_t msu_page2_start = 0x2000;
+  uint32_t msu_page_size = 0x2000;
+
+  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);
+  dac_pause();
+  dac_reset();
+/* audio_start, data_start, 0, audio_ctrl[1:0], ctrl_start */
+  while(1){
+    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) {
+	msu_addr = 0x0;
+	msu_page1_start = msu_page2_start + msu_page_size;
+	pageno = 1;
+      } 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);
+    }
+
+    /* Audio buffer refill */
+    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);
+    }
+
+    if(fpga_status_now & 0x0020) {
+      char suffix[11];
+
+      /* get trackno */
+      msu_track = get_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 */
+    }
+
+    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);
+    }
+
+    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 {
+	msu_repeat = 0;
+	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 */
+	dac_play();
+      } else {
+	DBG_MSU1 printf("PAUSE!\n");
+	set_msu_status(0x00, 0x03); /* set no bits, reset bit 1+0 */
+	dac_pause();
+      }
+    }
+
+    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 */
+	dac_pause();
+      }
+      bytes_read = MSU_DAC_BUFSIZE;
+    }
+    if(msu1_check_reset()) {
+      f_close(&msufile);
+      f_close(&file_handle);
+      return 1;
+    }
+  }
 }
 /* END OF MSU1 STUFF */

src/msu1.h

@@ -7,9 +7,9 @@
 #define DBG_MSU1 while(0)
 #endif
 
-#define MSU_DAC_BUFSIZE (2048)
+#define MSU_DAC_BUFSIZE	(2048)
 
-int msu1_check( uint8_t * );
+int msu1_check(uint8_t*);
-int msu1_loop( void );
+int msu1_loop(void);
 
 #endif