fix gb save size calculations, upped the serial baud rate.

DacoTaco · Jun 1, 2019 · a7df639 · a7df639
1 parent f81903c
commit a7df639
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 9 deletions.
diff --git a/AVR Code/GBC_Dumper.c b/AVR Code/GBC_Dumper.c
@@ -217,7 +217,7 @@ int main(void)
  {
  cprintf("gb mode\r\n");
  Setup_Pins_8bitMode();
- }  
+ } 
  /*cprintf("address (0x%X): 0x%02X%02X%02X\r\n",addr, addr & 0xFF,(addr >> 8) & 0xFF,(addr >> 16) & 0xFF);
  uint16_t data = Read24BitBytes(addr);
  uint8_t d1 = data >> 8;

diff --git a/AVR Code/Makefile b/AVR Code/Makefile
@@ -73,7 +73,7 @@ DEBUG = dwarf-2
 # _VA_SUPPORT is for Variadic functions in cprintf (accepting arguments)
 # SAVE_SPACE is to set it so all code having defines for saving space will disable code to do so
 #SHIFTING_MODE
-CUSTOMDEFINES = -DBAUD=500000 -DSAVE_SPACE 
+CUSTOMDEFINES = -DBAUD=1000000 -DSAVE_SPACE 
 #CUSTOMDEFINES = -D_VA_SUPPORT -DSCL_CLOCK=400
 
 ifeq ($(MCU),atmega8)

diff --git a/AVR Code/gbc_api.c b/AVR Code/gbc_api.c
@@ -164,11 +164,11 @@ int8_t API_Get_Memory(ROM_TYPE type,int8_t _gbaMode)
 
  if(end_addr < 0xC000)
  {
- gameInfo.fileSize = end_addr - 0xA000;
+ gameInfo.fileSize = end_addr - 0xA000UL;
  }
  else
  {
- gameInfo.fileSize = 0x2000 * _banks;
+ gameInfo.fileSize = 0x2000UL * _banks;
  }
  } 
  }
@@ -215,11 +215,11 @@ int8_t API_WriteGBRam(void)
  //for WRITERAM we need to send Ram size, wait for the OK(0x80) or NOK(anything NOT 0x80) signal, and then start receiving.
  if(end_addr < 0xC000)
  {
- gameInfo.fileSize = end_addr - 0xA000;
+ gameInfo.fileSize = end_addr - 0xA000UL;
  }
  else
  {
- gameInfo.fileSize = 0x2000 * banks;
+ gameInfo.fileSize = 0x2000UL * banks;
  }
 
  API_Send_Size();
@@ -331,6 +331,23 @@ int8_t API_WriteGBRam(void)
  EnableSerialInterrupt();
  return ret;
 }
+int8_t API_WriteGBARam()
+{
+ if(gameInfo.CartFlag != GBA_SAVE_NONE)
+ return ERR_NO_SAVE;
+
+ int8_t ret = -1;
+
+ if(gameInfo.CartFlag != GBA_SAVE_SRAM)
+ {
+ ret = ERR_NO_INFO;
+ goto end_write_gba;
+ }
+
+end_write_gba:
+ API_ResetGameInfo();
+ return ret;
+}
 int8_t API_WriteRam(int8_t _gbaMode)
 { 
  API_SetupPins(_gbaMode);
@@ -348,7 +365,7 @@ int8_t API_WriteRam(int8_t _gbaMode)
 
  if(_gba_cart)
  {
- return -1;
+ return API_WriteGBARam();
  }
  else
  {

diff --git a/Documentation/DS_FT232R.pdf b/Documentation/DS_FT232R.pdf
diff --git a/Windows Tool/GB_Dumper/API/API.Functions.cs b/Windows Tool/GB_Dumper/API/API.Functions.cs
@@ -238,7 +238,6 @@ private bool API_ProcessHeader(byte[] data)
  if (serialInterface.BytesToRead > 0)
  {
  //we have data!
- data = serialInterface.Read(serialInterface.BytesToRead);
  data = data.Concat(serialInterface.Read(serialInterface.BytesToRead)).ToArray();
  }
 

diff --git a/Windows Tool/GB_Dumper/MainWindow.xaml.cs b/Windows Tool/GB_Dumper/MainWindow.xaml.cs
@@ -105,7 +105,7 @@ public void RefreshSerial()
 
  cbBaudRate.ItemsSource = apiHandler.BaudRates;
  if (cbBaudRate.Items.Count > 0)
- cbBaudRate.SelectedItem = 500000;
+ cbBaudRate.SelectedItem = 1000000;
  else
  cbBaudRate.SelectedIndex = -1;