fix timing; misc cleanup

src/main.c

@@ -129,17 +129,9 @@ int main(void) {
     clock_prescale_set(CLOCK_PRESCALE);
 #endif
 
-/*  BUSY_LED_SETDDR();
-  DIRTY_LED_SETDDR();
-  AUX_LED_SETDDR();
-
-  AUX_LED_OFF();
-  set_busy_led(1);
-  set_dirty_led(0);
-*/
     snes_reset(1);
     uart_init();
-    sei();
+//    sei();   // interrupts are bad for now, resets the poor AVR when inserting SD card
     _delay_ms(100);
     disk_init();
     snes_init();
@@ -151,19 +143,14 @@ int main(void) {
 
     FATFS fatfs;
     f_mount(0,&fatfs);
-    set_busy_led(0);
+    set_busy_led(1);
     uart_putc('W');
     fpga_init();
     fpga_pgm("/sd2snes/main.bit");
 	fpga_spi_init();
     uart_putc('!');
 	_delay_ms(100);
-//set_avr_bank(0);
     set_avr_ena(0);
-//    set_avr_read(1);
-//    set_avr_write(1);
-//    AVR_ADDR_RESET();
-//    set_avr_addr_en(0);
 	snes_reset(1);
 
 	uart_putc('(');
@@ -184,7 +171,7 @@ int main(void) {
 	}
 
 
- /* HERE BE LIONS */
+/* HERE BE LIONS */
 while(1)  {	
 	SPI_SS_HIGH();
 	FPGA_SS_LOW();
@@ -197,8 +184,13 @@ while(1)  {
 	spiTransferByte(0x81); // read w/ increment... hopefully
 	spiTransferByte(0x00); // 1 dummy read
 	uart_putcrlf();
-	for(uint8_t cnt=0; cnt<16; cnt++) {
+	uint8_t buff[21];
+	for(uint8_t cnt=0; cnt<21; cnt++) {
 	    uint8_t data=spiTransferByte(0x00);
+		buff[cnt]=data;
+	}
+	for(uint8_t cnt=0; cnt<21; cnt++) {
+		uint8_t data = buff[cnt];
 		_delay_ms(2);
 	    if(data>=0x20 && data <= 0x7a) {
 			uart_putc(data);

src/memory.c

@@ -46,9 +46,8 @@ void sram_writeblock(void* buf, uint32_t addr, uint16_t size) {
 }
 
 uint32_t load_rom(char* filename) {
-// TODO Mapper, Mirroring, Bankselect
 	snes_romprops_t romprops;
-//	set_avr_bank(0);
+	set_avr_bank(0);
 	UINT bytes_read;
 	DWORD filesize;
 	UINT count=0;
@@ -163,12 +162,12 @@ void save_sram(char* filename, uint32_t sram_size, uint32_t base_addr) {
 }
 
 
-uint32_t calc_sram_crc(uint32_t size) {
+uint32_t calc_sram_crc(uint32_t base_addr, uint32_t size) {
 	uint8_t data;
 	uint32_t count;
 	uint16_t crc;
 	crc=0;
-	set_avr_bank(3);
+	set_avr_addr(base_addr);
 	SPI_SS_HIGH();
 	FPGA_SS_HIGH();
 	FPGA_SS_LOW();
@@ -176,16 +175,8 @@ uint32_t calc_sram_crc(uint32_t size) {
 	spiTransferByte(0x00);
 	for(count=0; count<size; count++) {
 		data = spiTransferByte(0);
-/*		uart_putc(hex[(data>>4)]);
-		uart_putc(hex[data&0xf]);
-		uart_putc(' ');
-		_delay_ms(2);*/
 		crc += crc16_update(crc, &data, 1);
 	}
 	FPGA_SS_HIGH();
-/*	uart_putc(hex[(crc>>28)&0xf]);
-	uart_putc(hex[(crc>>24)&0xf]);
-	uart_putc(hex[(crc>>20)&0xf]);
-	uart_putc(hex[(crc>>16)&0xf]); */
 	return crc;
 }

src/memory.h

@@ -6,5 +6,5 @@
 	uint32_t load_rom(char* filename);
 	uint32_t load_sram(char* filename);
 	void save_sram(char* filename, uint32_t sram_size, uint32_t base_addr);
-	uint32_t calc_sram_crc(uint32_t size);
+	uint32_t calc_sram_crc(uint32_t base_addr, uint32_t size);
 #endif

src/snes.c

@@ -14,9 +14,9 @@
 
 
 uint8_t initloop=1;
-uint32_t sram_crc, sram_crc_old;
-uint32_t sram_size = 8192; // sane default
-uint32_t sram_base_addr = 0x600000; // chip 3
+uint32_t saveram_crc, saveram_crc_old;
+uint32_t saveram_size = 8192; // sane default
+uint32_t saveram_base_addr = 0x600000; // chip 3
 void snes_init() {
 	DDRD |= _BV(PD5);	// PD5 = RESET_DIR
 	DDRD |= _BV(PD6); 	// PD6 = RESET
@@ -46,18 +46,18 @@ void snes_reset(int state) {
  */
 void snes_main_loop() {
 	if(initloop) {
-		sram_crc_old = calc_sram_crc(sram_size);
-		save_sram("/test.srm", sram_size, sram_base_addr);
+		saveram_crc_old = calc_sram_crc(saveram_base_addr, saveram_size);
+		save_sram("/test.srm", saveram_size, saveram_base_addr);
 		initloop=0;
 	}
-	sram_crc = calc_sram_crc(sram_size);
-	if(sram_crc != sram_crc_old) {
+	saveram_crc = calc_sram_crc(saveram_base_addr, saveram_size);
+	if(saveram_crc != saveram_crc_old) {
 		uart_putc('U');
-		uart_puthexlong(sram_crc);
+		uart_puthexshort(saveram_crc);
 		uart_putcrlf();
 		set_busy_led(1);
-		save_sram("/test.srm", sram_size, sram_base_addr);
+		save_sram("/test.srm", saveram_size, saveram_base_addr);
 		set_busy_led(0);
 	}
-	sram_crc_old = sram_crc;
+	saveram_crc_old = saveram_crc;
 }

src/uart.c

@@ -79,6 +79,12 @@ void uart_puthexlong(uint32_t num) {
 	uart_puthex(num&0xff);
 }
 
+void uart_puthexshort(uint16_t num) {
+	uart_puthex((num>>8)&0xff);
+	uart_puthex(num&0xff);
+}
+
+
 void uart_trace(void *ptr, uint16_t start, uint16_t len) {
   uint16_t i;
   uint8_t j;

src/uart.h

@@ -36,6 +36,7 @@ unsigned char uart_getc(void);
 void uart_putc(char c);
 void uart_puthex(uint8_t num);
 void uart_puthexlong(uint32_t num);
+void uart_puthexshort(uint16_t num);
 void uart_trace(void *ptr, uint16_t start, uint16_t len);
 void uart_flush(void);
 void uart_puts_P(prog_char *text);