vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/disk/usbms.c (grub_usbms_cbi_cmd): Fix error type.

Browse source 
(grub_usbms_cbi_reset): Likewise.
	(grub_usbms_bo_reset): Likewise.
	(grub_usbms_reset): Likewise.
	(grub_usbms_attach): Likewise.
	(grub_usbms_transfer_cbi): Likewise.
This commit is contained in:
Vladimir Serbinenko 2013-11-07 00:55:17 +01:00
parent 3ee0869734
commit ac35a0f792
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2013-11-07 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/usbms.c (grub_usbms_cbi_cmd): Fix error type.
(grub_usbms_cbi_reset): Likewise.
(grub_usbms_bo_reset): Likewise.
(grub_usbms_reset): Likewise.
(grub_usbms_attach): Likewise.
(grub_usbms_transfer_cbi): Likewise.
2013-11-07 Vladimir Serbinenko <phcoder@gmail.com> 2013-11-07 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/io/lzopio.c (test_header): Simplify code and remove useless * grub-core/io/lzopio.c (test_header): Simplify code and remove useless

21
grub-core/disk/usbms.c
View file

@ -76,7 +76,7 @@ typedef struct grub_usbms_dev *grub_usbms_dev_t;
static grub_usbms_dev_t grub_usbms_devices[MAX_USBMS_DEVICES]; static grub_usbms_dev_t grub_usbms_devices[MAX_USBMS_DEVICES];
static int first_available_slot = 0; static int first_available_slot = 0;
static grub_err_t static grub_usb_err_t
grub_usbms_cbi_cmd (grub_usb_device_t dev, int interface, grub_usbms_cbi_cmd (grub_usb_device_t dev, int interface,
grub_uint8_t *cbicb) grub_uint8_t *cbicb)
{ {
@ -86,7 +86,7 @@ grub_usbms_cbi_cmd (grub_usb_device_t dev, int interface,
GRUB_USBMS_CBI_CMD_SIZE, (char*)cbicb); GRUB_USBMS_CBI_CMD_SIZE, (char*)cbicb);
} }
static grub_err_t static grub_usb_err_t
grub_usbms_cbi_reset (grub_usb_device_t dev, int interface) grub_usbms_cbi_reset (grub_usb_device_t dev, int interface)
{ {
/* Prepare array with Command Block Reset (=CBR) */ /* Prepare array with Command Block Reset (=CBR) */
@ -108,17 +108,13 @@ grub_usbms_cbi_reset (grub_usb_device_t dev, int interface)
return grub_usbms_cbi_cmd (dev, interface, (grub_uint8_t *)&cbicb); return grub_usbms_cbi_cmd (dev, interface, (grub_uint8_t *)&cbicb);
} }
static grub_err_t static grub_usb_err_t
grub_usbms_bo_reset (grub_usb_device_t dev, int interface) grub_usbms_bo_reset (grub_usb_device_t dev, int interface)
{ {
grub_usb_err_t u; return grub_usb_control_msg (dev, 0x21, 255, 0, interface, 0, 0);
u = grub_usb_control_msg (dev, 0x21, 255, 0, interface, 0, 0);
if (u)
return grub_error (GRUB_ERR_IO, "USB error %d", u);
return GRUB_ERR_NONE;
} }
static grub_err_t static grub_usb_err_t
grub_usbms_reset (grub_usbms_dev_t dev) grub_usbms_reset (grub_usbms_dev_t dev)
{ {
if (dev->protocol == GRUB_USBMS_PROTOCOL_BULK) if (dev->protocol == GRUB_USBMS_PROTOCOL_BULK)
@ -149,7 +145,7 @@ grub_usbms_attach (grub_usb_device_t usbdev, int configno, int interfno)
int j; int j;
grub_uint8_t luns = 0; grub_uint8_t luns = 0;
unsigned curnum; unsigned curnum;
grub_usb_err_t err = GRUB_ERR_NONE; grub_usb_err_t err = GRUB_USB_ERR_NONE;
grub_boot_time ("Attaching USB mass storage"); grub_boot_time ("Attaching USB mass storage");
@ -572,7 +568,10 @@ grub_usbms_transfer_cbi (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
} }
} }
return err; if (err)
return grub_error (GRUB_ERR_IO, "USB error %d", err);
return GRUB_ERR_NONE;
} }