Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed error checking

Browse Source
This commit is contained in:
Markus Fröschle
2013-07-18 13:11:52 +00:00
parent 8316c31f2a
commit 0fe44c5f1d
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
BaS_gcc/sources/xhdi_sd.c
View File

@@ -186,11 +186,25 @@ uint32_t xhdi_get_capacity(uint16_t major, uint16_t minor, uint32_t *blocks, uin
{ {
if (major == MY_MAJOR) if (major == MY_MAJOR)
{ {
if (disk_ioctl(0, GET_SECTOR_COUNT, blocks) != RES_OK) if (blocks != 0)
return ERROR; {
if (disk_ioctl(0, GET_SECTOR_SIZE, bs) != RES_OK) if (disk_ioctl(0, GET_SECTOR_COUNT, blocks) != RES_OK)
return ERROR; {
*bs = 512; xprintf("disk_ioctl(0, GET_SECTOR_COUNT, %p) failed in xhdi_get_capacity()\r\n");
return ERROR;
}
}
if (bs != 0)
{
if (disk_ioctl(0, GET_SECTOR_SIZE, bs) != RES_OK)
{
xprintf("disk_ioctl(0, GET_SECTOR_SIZE, %p) failed in xhdi_get_capacity()\r\n");
return ERROR;
}
}
return E_OK; return E_OK;
} }
return EUNDEV; return EUNDEV;