From 49df405d14d174cdb21a35b17dc2ce16f2ef7a26 Mon Sep 17 00:00:00 2001
From: optixx <david@optixx.org>
Date: Mon, 21 Sep 2009 08:32:17 +0200
Subject: [PATCH] add reset command

---
 avr/usbload/main.c  |  3 +++
 avr/usbload/shell.c | 52 ++++++++++++++++++++++++++++++++++-----------
 avr/usbload/shell.h |  2 ++
 3 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/avr/usbload/main.c b/avr/usbload/main.c
index 2354de0..2257f5d 100644
--- a/avr/usbload/main.c
+++ b/avr/usbload/main.c
@@ -47,6 +47,7 @@
 #include "irq.h"
 #include "pwm.h"
 #include "testing.h"
+#include "shell.h"
 
 
 
@@ -337,6 +338,7 @@ int main(void)
         info_P(PSTR("USB poll\n"));
         while (req_state != REQ_STATUS_SNES) {
             usbPoll();
+            shell_run();
         }
         
         
@@ -363,6 +365,7 @@ int main(void)
         info_P(PSTR("Poll USB\n"));
         while ((req_state != REQ_STATUS_AVR)) {
             usbPoll();
+            shell_run();
         }
         info_P(PSTR("-->Switch TO AVR\n"));
         
diff --git a/avr/usbload/shell.c b/avr/usbload/shell.c
index b941d26..a522bb7 100644
--- a/avr/usbload/shell.c
+++ b/avr/usbload/shell.c
@@ -33,6 +33,8 @@
 #include "sram.h"
 #include "util.h"
 #include "uart.h"
+#include "dump.h"
+#include "irq.h"
  
 #define RECEIVE_BUF_LEN 40
  
@@ -136,6 +138,14 @@ static uint8_t get_int32(uint32_t *val)
  	printf("Invalid argument (should be 0 or 1)!\n");
  	return -1;
  } 
+ void prompt(void){
+     
+     uart_putc('\r');
+     uart_putc('\n');
+     uart_putc(':');
+     uart_putc('>');
+     
+ }
  
 ISR(USART0_RX_vect)		//	Interrupt for UART Byte received
 {
@@ -145,10 +155,7 @@ ISR(USART0_RX_vect)		//	Interrupt for UART Byte received
     cr=1;
     recv_buf[recv_counter]='\0';
     recv_counter=0;
-    uart_putc('\r');
-    uart_putc('\n');
-    uart_putc(':');
-    uart_putc('>');
+    prompt();
   }
   recv_buf[recv_counter] = UDR0;
   uart_putc(recv_buf[recv_counter]); /* do a echo, maybe should reside not in interrupt */
@@ -157,10 +164,7 @@ ISR(USART0_RX_vect)		//	Interrupt for UART Byte received
     cr = 1;				//	found a CR, so the application should do something
     recv_buf[++recv_counter]='\0';  // terminate string
     recv_counter = 0;
-    uart_putc('\r');
-    uart_putc('\n');
-    uart_putc(':');
-    uart_putc('>');
+    prompt();
   } else {
     // we accept backspace or delete
     if ((recv_buf[recv_counter] == 0x08 || recv_buf[recv_counter] == 0x7f) && recv_counter > 0) {
@@ -173,9 +177,10 @@ ISR(USART0_RX_vect)		//	Interrupt for UART Byte received
 }
 
 
-void shellrun(void)
+uint8_t command_buf[RECEIVE_BUF_LEN];
+
+void shell_run(void)
 {
-    uint8_t command_buf[RECEIVE_BUF_LEN];
 	uint8_t *t;
     uint32_t arg1;
     uint32_t arg2;
@@ -188,6 +193,7 @@ void shellrun(void)
 	
 	token_ptr = command_buf;
 	t = get_token();
+	
 	if (t == NULL)
 		return;
 
@@ -197,6 +203,28 @@ void shellrun(void)
         if (get_hex_arg2(&arg1,&arg2))
             dump_memory(arg1,arg2);
         else 
-            printf("ERROR: arg parsing\n");
+            printf("DUMP <start addr> <end addr> %i %i\n",arg1,arg2);
     }
-}
\ No newline at end of file
+	else if (strcmp((char*)t, "RESET") == 0) {
+        leave_application();
+    }
+    prompt();
+    
+    /*
+    reset
+    reset snes
+    dias
+    switch to avr mode
+    swicth to snes mode
+    send irq
+    crc
+    set irq vector
+    set reset vector
+    set rom mode
+
+    
+    
+    
+}
+
+
diff --git a/avr/usbload/shell.h b/avr/usbload/shell.h
index 536aaab..db67b27 100644
--- a/avr/usbload/shell.h
+++ b/avr/usbload/shell.h
@@ -21,4 +21,6 @@
 #ifndef __SHELL_H__
 #define __SHELL_H__
 
+ void shell_run(void);
+
 #endif