godzil/quickdev16
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
optixx 2009-09-22 21:34:20 +02:00
parent 850d1790cb
commit b2e13a54eb
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
avr/usbload/command.h
View File

@ -27,5 +27,5 @@ void send_irq();
void set_rom_mode(); void set_rom_mode();
void usb_connect(); void usb_connect();
void boot_startup_rom(uint16_t init_delay); void boot_startup_rom(uint16_t init_delay);
void banner();
#endif #endif

3
avr/usbload/config.h
View File

@ -43,7 +43,8 @@
#define USB_CRC_CHECK 0x01 #define USB_CRC_CHECK 0x01
#define TRANSFER_BUFFER_SIZE 0x000 #define TRANSFER_BUFFER_SIZE 0x000
#define FORMAT_BUFFER_LEN 0x100 #define FORMAT_BUFFER_LEN 0x080
#define RECEIVE_BUF_LEN 0x030
#define HW_VERSION "2.6" #define HW_VERSION "2.6"
#define SW_VERSION "1.0" #define SW_VERSION "1.0"

4
avr/usbload/shared_memory.h
View File

@ -37,7 +37,7 @@
#define SHARED_MEM_TX_CMD_TERMINATE 0x06 #define SHARED_MEM_TX_CMD_TERMINATE 0x06
#define SHARED_MEM_TX_LOC_STATE 0x000000 #define SHARED_MEM_TX_LOC_STATE 0x000000
#define SHARED_MEM_TX_LOC_SIZE 0x000100 #define SHARED_MEM_TX_LOC_SIZE 0x000040
#define SHARED_MEM_TX_LOC_CMD 0x000001 #define SHARED_MEM_TX_LOC_CMD 0x000001
#define SHARED_MEM_TX_LOC_PAYLOAD 0x000002 #define SHARED_MEM_TX_LOC_PAYLOAD 0x000002
@ -48,7 +48,7 @@
#define SHARED_MEM_RX_CMD_FILESEL 0x01 #define SHARED_MEM_RX_CMD_FILESEL 0x01
#define SHARED_MEM_RX_LOC_STATE 0x001000 #define SHARED_MEM_RX_LOC_STATE 0x001000
#define SHARED_MEM_RX_LOC_SIZE 0x000100 #define SHARED_MEM_RX_LOC_SIZE 0x000040
#define SHARED_MEM_RX_LOC_CMD 0x001001 #define SHARED_MEM_RX_LOC_CMD 0x001001
#define SHARED_MEM_RX_LOC_LEN 0x001002 #define SHARED_MEM_RX_LOC_LEN 0x001002
#define SHARED_MEM_RX_LOC_PAYLOAD 0x001003 #define SHARED_MEM_RX_LOC_PAYLOAD 0x001003

26
avr/usbload/shell.c
View File

@ -107,7 +107,7 @@ uint8_t get_hex_arg3(uint32_t *hexval1, uint32_t *hexval2, uint32_t *hexval3)
static uint8_t get_int32(uint32_t *val) static uint8_t get_int32(uint32_t *val)
{ {
if (!get_hex(val)){ if (!get_hex(val)){
printf("Invalid argument!\n"); info_P(PSTR("Invalid argument!\n"));
return 0; return 0;
} else { } else {
return 1; return 1;
@ -118,7 +118,7 @@ static uint8_t get_int32(uint32_t *val)
{ {
uint32_t ret; uint32_t ret;
if (!get_hex(&ret) ||ret > 0xff){ if (!get_hex(&ret) ||ret > 0xff){
printf("Invalid argument!\n"); info_P(PSTR("Invalid argument!\n"));
return 0; return 0;
}else{ }else{
*val = (uint8_t)ret; *val = (uint8_t)ret;
@ -135,7 +135,7 @@ static uint8_t get_int32(uint32_t *val)
if (result >= 0) if (result >= 0)
return result; return result;
} }
printf("Invalid argument (should be 0 or 1)!\n"); info_P(PSTR("Invalid argument (should be 0 or 1)!\n"));
return -1; return -1;
} }
void prompt(void){ void prompt(void){
@ -203,49 +203,49 @@ void shell_run(void)
if (get_hex_arg2(&arg1,&arg2)) if (get_hex_arg2(&arg1,&arg2))
dump_memory(arg1,arg2); dump_memory(arg1,arg2);
else else
printf("DUMP <start addr> <end addr>\n"); info_P(PSTR("DUMP <start addr> <end addr>\n"));
}else if (strcmp((char*)t, "CRC") == 0) { }else if (strcmp((char*)t, "CRC") == 0) {
if (get_hex_arg2(&arg1,&arg2)){ if (get_hex_arg2(&arg1,&arg2)){
crc = crc_check_bulk_memory(arg1,arg2,0x8000); crc = crc_check_bulk_memory(arg1,arg2,0x8000);
printf("0x%06lx - 0x%06lx crc=0x%04x\n",arg1,arg2,crc); info_P(PSTR("0x%06lx - 0x%06lx crc=0x%04x\n"),arg1,arg2,crc);
} else } else
printf("CRC <start addr> <end addr>\n"); info_P(PSTR("CRC <start addr> <end addr>\n"));
}else if (strcmp((char*)t, "EXIT") == 0) { }else if (strcmp((char*)t, "EXIT") == 0) {
leave_application(); leave_application();
}else if (strcmp((char*)t, "RESET") == 0) { }else if (strcmp((char*)t, "RESET") == 0) {
send_reset(); send_reset();
}else if (strcmp((char*)t, "IRQ") == 0) { }else if (strcmp((char*)t, "IRQ") == 0) {
printf("Send IRQ\n"); info_P(PSTR("Send IRQ\n"));
snes_irq_on(); snes_irq_on();
snes_irq_lo(); snes_irq_lo();
_delay_us(20); _delay_us(20);
snes_irq_hi(); snes_irq_hi();
snes_irq_off(); snes_irq_off();
}else if (strcmp((char*)t, "AVR") == 0) { }else if (strcmp((char*)t, "AVR") == 0) {
printf("Activate AVR bus\n"); info_P(PSTR("Activate AVR bus\n"));
avr_bus_active(); avr_bus_active();
snes_irq_lo(); snes_irq_lo();
snes_irq_off(); snes_irq_off();
}else if (strcmp((char*)t, "SNES") == 0) { }else if (strcmp((char*)t, "SNES") == 0) {
printf("Activate SNES bus\n"); info_P(PSTR("Activate SNES bus\n"));
snes_irq_lo(); snes_irq_lo();
snes_irq_off(); snes_irq_off();
snes_wr_disable(); snes_wr_disable();
snes_bus_active(); snes_bus_active();
}else if (strcmp((char*)t, "LOROM") == 0) { }else if (strcmp((char*)t, "LOROM") == 0) {
printf("Set LOROM\n"); info_P(PSTR("Set LOROM\n"));
snes_lorom(); snes_lorom();
snes_wr_disable(); snes_wr_disable();
}else if (strcmp((char*)t, "HIROM") == 0) { }else if (strcmp((char*)t, "HIROM") == 0) {
printf("Set HIROM\n"); info_P(PSTR("Set HIROM\n"));
snes_hirom(); snes_hirom();
snes_wr_disable(); snes_wr_disable();
}else if (strcmp((char*)t, "WRDISABLE") == 0) { }else if (strcmp((char*)t, "WRDISABLE") == 0) {
printf("Set WR disable"); info_P(PSTR("Set WR disable"));
snes_wr_disable(); snes_wr_disable();
}else if (strcmp((char*)t, "WRENABLE") == 0) { }else if (strcmp((char*)t, "WRENABLE") == 0) {
printf("Set WR disable"); info_P(PSTR("Set WR disable"));
snes_wr_enable(); snes_wr_enable();
}else if (strcmp((char*)t, "LOADER") == 0) { }else if (strcmp((char*)t, "LOADER") == 0) {
boot_startup_rom(500); boot_startup_rom(500);