From ec2ef98d5919448afb870df5ce42ce420813f628 Mon Sep 17 00:00:00 2001
From: optixx <david@optixx.org>
Date: Sun, 3 May 2009 19:02:19 +0200
Subject: [PATCH] o got working version with the atmega88 board

---
 poc/avr_usbload/Makefile                   |  8 ++++----
 poc/avr_usbload/commandline/snesuploader.c |  2 +-
 poc/avr_usbload/main.c                     | 14 +++++++-------
 poc/avr_usbload/uart.c                     | 20 ++++++++++----------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/poc/avr_usbload/Makefile b/poc/avr_usbload/Makefile
index a837423..ea63cc6 100644
--- a/poc/avr_usbload/Makefile
+++ b/poc/avr_usbload/Makefile
@@ -7,14 +7,14 @@
 # License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
 # This Revision: $Id: Makefile 692 2008-11-07 15:07:40Z cs $
 
-DEVICE  = atmega16
-F_CPU   = 16000000	# in Hz
+DEVICE  = atmega88
+F_CPU   = 20000000	# in Hz
 FUSE_L  = # see below for fuse values for particular devices
 FUSE_H  = 
-AVRDUDE = avrdude -c stk500v2 -p $(DEVICE) -P /dev/tty.PL2303-00002006 
+AVRDUDE = avrdude -c usbasp -p $(DEVICE) 
 
 CFLAGS  = -Iusbdrv -I. -DDEBUG_LEVEL=0
-OBJECTS = usbdrv/usbdrv.o usbdrv/usbdrvasm.o usbdrv/oddebug.o main.o uart.o fifo.o sram.o crc.o debug.o
+OBJECTS = usbdrv/usbdrv.o usbdrv/usbdrvasm.o usbdrv/oddebug.o main.o uart.o fifo.o  crc.o debug.o
 
 COMPILE = avr-gcc -Wall -Os -DF_CPU=$(F_CPU) $(CFLAGS) -mmcu=$(DEVICE)
 
diff --git a/poc/avr_usbload/commandline/snesuploader.c b/poc/avr_usbload/commandline/snesuploader.c
index f7be0b5..4e8ae15 100644
--- a/poc/avr_usbload/commandline/snesuploader.c
+++ b/poc/avr_usbload/commandline/snesuploader.c
@@ -19,7 +19,7 @@ respectively.
 */
 
 
-#define BUFFER_SIZE     4
+#define BUFFER_SIZE     (128)
 #define BUFFER_CRC      (1024 * 64)
 #define BANK_SIZE       (1<<15)
 
diff --git a/poc/avr_usbload/main.c b/poc/avr_usbload/main.c
index 6b22a29..29ba1cb 100644
--- a/poc/avr_usbload/main.c
+++ b/poc/avr_usbload/main.c
@@ -9,7 +9,7 @@
 #include "oddebug.h"        /* This is also an example for using debug macros */
 #include "requests.h"       /* The custom request numbers we use */
 #include "uart.h"
-#include "sram.h"
+//#include "sram.h"
 #include "debug.h"
 #include "crc.h"
 
@@ -56,7 +56,7 @@ usbMsgLen_t usbFunctionSetup(uchar data[8]){
     	crc = 0;
         cli();
         for (addr=0x000000; addr<rom_addr; addr+=BUFFER_SIZE) {
-        	sram_read_buffer(addr,read_buffer,BUFFER_SIZE);
+        	//sram_read_buffer(addr,read_buffer,BUFFER_SIZE);
     		crc = do_crc_update(crc,read_buffer,BUFFER_SIZE);
             //dump_packet(rom_addr,BUFFER_SIZE,read_buffer);
     		if (addr && addr%32768 == 0){
@@ -80,7 +80,7 @@ uint8_t usbFunctionWrite(uint8_t *data, uint8_t len)
 
     //printf("usbFunctionWrite addr=%lx len=%i remain=%i\n",rom_addr,len,bytes_remaining);
     cli();
-    sram_copy(rom_addr,data,len);
+    //sram_copy(rom_addr,data,len);
     sei();
     rom_addr +=len;
     //printf("usbFunctionWrite %lx %x\n",rom_addr,len);
@@ -97,10 +97,10 @@ int main(void)
     //wdt_enable(WDTO_1S);
     uart_init();
     stdout = &uart_stdout;
-    sram_init();
- 	printf("SRAM Init\n");
- 	spi_init();
- 	printf("SPI Init\n");
+    //sram_init();
+ 	//printf("SRAM Init\n");
+ 	//spi_init();
+ 	//printf("SPI Init\n");
     usbInit();
  	printf("USB Init\n");
     usbDeviceDisconnect();  /* enforce re-enumeration, do this while interrupts are disabled! */
diff --git a/poc/avr_usbload/uart.c b/poc/avr_usbload/uart.c
index 22aa618..d51d974 100644
--- a/poc/avr_usbload/uart.c
+++ b/poc/avr_usbload/uart.c
@@ -24,18 +24,18 @@ FILE uart_stdout = FDEV_SETUP_STREAM(uart_stream, NULL, _FDEV_SETUP_WRITE);
 
 void uart_init(void)
 {
-    UCSRA = _BV(U2X);     /* improves baud rate error @ F_CPU = 1 MHz */
-    UCSRB = _BV(TXEN)|_BV(RXEN)|_BV(RXCIE); /* tx/rx enable, rx complete intr */
-    UBRRL = (F_CPU / (8 * 115200UL)) - 1;  /* 9600 Bd */
+    UCSR0A = _BV(U2X0);     /* improves baud rate error @ F_CPU = 1 MHz */
+    UCSR0B = _BV(TXEN0)|_BV(RXEN0)|_BV(RXCIE0); /* tx/rx enable, rx complete intr */
+    UBRR0L = (F_CPU / (8 * 115200UL)) - 1;  /* 9600 Bd */
 
 }
 
 
-ISR(USART_RXC_vect)
+ISR(USART_RX_vect)
 {
     uint8_t c;
-    c = UDR;
-    if (bit_is_clear(UCSRA, FE)){
+    c = UDR0;
+    if (bit_is_clear(UCSR0A, FE0)){
         rxbuff = c;
         intflags.rx_int = 1;
     }
@@ -44,8 +44,8 @@ ISR(USART_RXC_vect)
 
 void  uart_putc(uint8_t c)
 {
-    loop_until_bit_is_set(UCSRA, UDRE);
-    UDR = c;
+    loop_until_bit_is_set(UCSR0A, UDRE0);
+    UDR0 = c;
 }
 
 
@@ -72,8 +72,8 @@ static int uart_stream(char c, FILE *stream)
 {
     if (c == '\n')
         uart_putc('\r');
-    loop_until_bit_is_set(UCSRA, UDRE);
-    UDR = c;
+    loop_until_bit_is_set(UCSR0A, UDRE0);
+    UDR0 = c;
     return 0;
 }