fix kernel usb sector size/count bug

caused unconditional -3 boot error with file write on. introduced in aa5ea1f I must have neglected to test that commit on account of 3am at the time
project-slippi · Oct 19, 2023 · 5936ee6 · 5936ee6
1 parent e6a5d01
commit 5936ee6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/kernel/main.c b/kernel/main.c
@@ -241,7 +241,7 @@ int _main( int argc, char *argv[] )
 		res = f_mount( devices[0], fatSdName, 1 );
 		if( res != FR_OK )
 		{
-			dbgprintf("ES:f_mount() failed:%d\r\n", res );
+			dbgprintf("SD ES:f_mount() failed:%d\r\n", res );
 			BootStatusError(-3, res);
 			mdelay(4000);
 			Shutdown();
@@ -255,7 +255,7 @@ int _main( int argc, char *argv[] )
 		res = f_mount( devices[1], fatUsbName, 1 );
 		if( res != FR_OK )
 		{
-			dbgprintf("ES:f_mount() failed:%d\r\n", res );
+			dbgprintf("USB ES:f_mount() failed:%d\r\n", res );
 			BootStatusError(-3, res);
 			mdelay(4000);
 			Shutdown();

diff --git a/kernel/usbstorage.c b/kernel/usbstorage.c
@@ -307,9 +307,8 @@ void USBStorage_Open()
 	sync_before_read((void*)0x132C1000, sizeof(important_storage_data));
 	important_storage_data *d = (important_storage_data*)0x132C1000;
 
-	usb_s_size = d->sector_size;
-	usb_s_cnt = d->sector_count;
-
+	__mounted_device.sector_size = d->sector_size;
+	__mounted_device.sector_count = d->sector_count;
 	__mounted_device.lun = d->lun;
 	__mounted_device.vid = d->vid;
 	__mounted_device.pid = d->pid;
@@ -319,6 +318,9 @@ void USBStorage_Open()
 	__mounted_device.ep_in = d->ep_in;
 	__mounted_device.ep_out = d->ep_out;
 
+	usb_s_size = __mounted_device.sector_size;
+	usb_s_cnt = __mounted_device.sector_count;
+
 	__mounted = true;
 
 	if(transferbuffer == NULL)