diff --git a/avr/usbload/main.c b/avr/usbload/main.c index 9a2b3d2..d13088a 100644 --- a/avr/usbload/main.c +++ b/avr/usbload/main.c @@ -320,7 +320,8 @@ void test_crc(){ int main(void) { uint8_t i; - + uint8_t c; + uart_init(); stdout = &uart_stdout; @@ -404,6 +405,23 @@ int main(void) while (req_state != REQ_STATUS_AVR){ usbPoll(); + i = 20; + while (--i) { /* fake USB disconnect for > 250 ms */ + _delay_ms(100); + } + printf("Send IRQ\n"); + snes_irq_lo(); + snes_irq_on(); + + avr_bus_active(); + c = sram_bulk_read(); + snes_bus_active(); + + snes_irq_off(); + + sram_bulk_read_start(0x003000); + printf("Read 0x3000=%c\n",c); + } } diff --git a/snes/irqtest/Makefile b/snes/irqtest/Makefile index 5a8b43d..4a03b00 100644 --- a/snes/irqtest/Makefile +++ b/snes/irqtest/Makefile @@ -9,11 +9,15 @@ OBJS=irqtest.o APP=irqtest.smc GFX= -all: clean $(APP) +all: clean $(APP) check run: zsnes $(APP) + +upload: smc + ucon64 --port=usb -xsnesram $(APP) + linkfile: echo "[objects]" > linkerfile.prj @@ -21,8 +25,13 @@ linkfile: optixx.inc: optixx.pcx wine tools/pcx2snes.exe optixx.pcx -b2 -nOptixx -ooptixx.inc -check: +check: ucon64 -chk $(APP) + rm -fv *.bak +smc: + ucon64 -smc $(APP) + rm -fv *.bak + %.o: %.asm echo "$@" >> linkerfile.prj diff --git a/snes/irqtest/header.inc b/snes/irqtest/header.inc index 87e5874..769fa13 100644 --- a/snes/irqtest/header.inc +++ b/snes/irqtest/header.inc @@ -26,7 +26,7 @@ LOROM CARTRIDGETYPE $00 ; $00 = ROM only, see WLA documentation for others - ROMSIZE $08 ; $08 = 2 Mbits, see WLA doc for more.. + ROMSIZE $07 ; $08 = 2 Mbits, see WLA doc for more.. SRAMSIZE $00 ; No SRAM see WLA doc for more.. COUNTRY $02 ; $01 = U.S. $00 = Japan, that's all I know LICENSEECODE $00 ; Just use $00 diff --git a/snes/irqtest/irqtest.asm b/snes/irqtest/irqtest.asm index dd23e82..c1aa9ee 100644 --- a/snes/irqtest/irqtest.asm +++ b/snes/irqtest/irqtest.asm @@ -47,8 +47,6 @@ Start_do: ; Setup Video modes and other stuff, then turn on the screen jsr SetupVideo - - prints "Init done" lda #$81 sta $4200 @@ -101,17 +99,13 @@ SetupVideo: ;.SECTION "IRQHandlers" COPHandler: - prints "COPHandler" rti BRKHandler: - prints "BRKHandler" rti ABRTHandler: - prints "ABRTHandler" rti NMIHandler: - prints "NMIHandler" rti IRQHandler: @@ -119,7 +113,13 @@ IRQHandler: lda PalNum sta $2122 sta $2122 - prints "IRQHandler" + + lda #65 + sta $3000 +idle: + lda $3001 + + rti