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

* grub-core/bus/usb/ohci.c (grub_ohci_cancel_transfer): Use %p to

Browse source 
print pointer.
	* grub-core/bus/usb/uhci.c: Remove empty define.
	(grub_uhci_check_transfer): Add missing cast.
	* grub-core/bus/usb/usbhub.c (poll_nonroot_hub): Use %p to
	print pointer.
	* grub-core/term/usb_keyboard.c (grub_usb_keyboard_getkey): Use
	PRIuGRUB_SIZE.
	* include/grub/types.h (PRIuGRUB_SIZE): New definition.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-09-19 22:05:48 +02:00
parent d6d94820b5
commit 9af6dac30d
6 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2010-09-19 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/bus/usb/ohci.c (grub_ohci_cancel_transfer): Use %p to
print pointer.
* grub-core/bus/usb/uhci.c: Remove empty define.
(grub_uhci_check_transfer): Add missing cast.
* grub-core/bus/usb/usbhub.c (poll_nonroot_hub): Use %p to
print pointer.
* grub-core/term/usb_keyboard.c (grub_usb_keyboard_getkey): Use
PRIuGRUB_SIZE.
* include/grub/types.h (PRIuGRUB_SIZE): New definition.
2010-09-19 Vladimir Serbinenko <phcoder@gmail.com> 2010-09-19 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/Makefile.core.def (legacycfg): Add * grub-core/Makefile.core.def (legacycfg): Add

4
grub-core/bus/usb/ohci.c
View file

@ -1192,8 +1192,8 @@ grub_ohci_cancel_transfer (grub_usb_controller_t dev,
tderr_virt = grub_ohci_td_phys2virt (o,cdata-> tderr_phys); tderr_virt = grub_ohci_td_phys2virt (o,cdata-> tderr_phys);
grub_dprintf ("ohci", "Cancel: tderr_phys=0x%08x, tderr_virt=0x%08x\n", grub_dprintf ("ohci", "Cancel: tderr_phys=0x%x, tderr_virt=%p\n",
cdata->tderr_phys, (unsigned int)tderr_virt); cdata->tderr_phys, tderr_virt);
if (tderr_virt) if (tderr_virt)
transfer->last_trans = tderr_virt->tr_index; transfer->last_trans = tderr_virt->tr_index;

2
grub-core/bus/usb/uhci.c
View file

@ -550,7 +550,7 @@ grub_uhci_check_transfer (grub_usb_controller_t dev,
*actual = 0; *actual = 0;
errtd = (grub_uhci_td_t) (cdata->qh->elinkptr & ~0x0f); errtd = (grub_uhci_td_t) (grub_addr_t) (cdata->qh->elinkptr & ~0x0f);
grub_dprintf ("uhci", ">t status=0x%02x data=0x%02x td=%p\n", grub_dprintf ("uhci", ">t status=0x%02x data=0x%02x td=%p\n",
errtd->ctrl_status, errtd->buffer & (~15), errtd); errtd->ctrl_status, errtd->buffer & (~15), errtd);

4
grub-core/bus/usb/usbhub.c
View file

@ -350,8 +350,8 @@ poll_nonroot_hub (grub_usb_device_t dev)
GRUB_USB_REQ_GET_STATUS, GRUB_USB_REQ_GET_STATUS,
0, i, sizeof (status), (char *) &status); 0, i, sizeof (status), (char *) &status);
grub_printf ("dev = 0x%0x, i = %d, status = %08x\n", grub_printf ("dev = %p, i = %d, status = %08x\n",
(unsigned int) dev, i, status); dev, i, status);
if (err) if (err)
continue; continue;

3
grub-core/term/usb_keyboard.c
View file

@ -404,7 +404,8 @@ grub_usb_keyboard_getkey (struct grub_term_input *term)
termdata->last_key = -1; termdata->last_key = -1;
grub_dprintf ("usb_keyboard", grub_dprintf ("usb_keyboard",
"err = %d, actual = %d report: 0x%02x 0x%02x 0x%02x 0x%02x" "err = %d, actual = %" PRIuGRUB_SIZE
" report: 0x%02x 0x%02x 0x%02x 0x%02x"
" 0x%02x 0x%02x 0x%02x 0x%02x\n", " 0x%02x 0x%02x 0x%02x 0x%02x\n",
err, actual, err, actual,
termdata->current_report[0], termdata->current_report[1], termdata->current_report[0], termdata->current_report[1],

3
include/grub/types.h
View file

@ -101,8 +101,10 @@ typedef grub_int64_t grub_ssize_t;
# if GRUB_CPU_SIZEOF_LONG == 8 # if GRUB_CPU_SIZEOF_LONG == 8
# define PRIxGRUB_SIZE "lx" # define PRIxGRUB_SIZE "lx"
# define PRIuGRUB_SIZE "lu"
# else # else
# define PRIxGRUB_SIZE "llx" # define PRIxGRUB_SIZE "llx"
# define PRIuGRUB_SIZE "llu"
# endif # endif
#else #else
typedef grub_uint32_t grub_addr_t; typedef grub_uint32_t grub_addr_t;
@ -110,6 +112,7 @@ typedef grub_uint32_t grub_size_t;
typedef grub_int32_t grub_ssize_t; typedef grub_int32_t grub_ssize_t;
# define PRIxGRUB_SIZE "x" # define PRIxGRUB_SIZE "x"
# define PRIuGRUB_SIZE "u"
#endif #endif
#if GRUB_CPU_SIZEOF_LONG == 8 #if GRUB_CPU_SIZEOF_LONG == 8