Author: stepan Date: Tue May 25 18:02:28 2010 New Revision: 5585 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5585
Log: Fix usbdebug compilation. Signed-off-by: Stefan Reinauer <[email protected]> Acked-by: Stefan Reinauer <[email protected]> Modified: trunk/src/include/usb_ch9.h trunk/src/include/usbdebug_direct.h trunk/src/lib/usbdebug_direct.c trunk/src/mainboard/kontron/986lcd-m/romstage.c Modified: trunk/src/include/usb_ch9.h ============================================================================== --- trunk/src/include/usb_ch9.h Tue May 25 18:00:08 2010 (r5584) +++ trunk/src/include/usb_ch9.h Tue May 25 18:02:28 2010 (r5585) @@ -61,22 +61,21 @@ #define USB_DEVICE_DEBUG_MODE 6 /* (special devices only) */ -//frim usb_ch9.h struct usb_ctrlrequest { - uint8_t bRequestType; - uint8_t bRequest; - uint16_t wValue; - uint16_t wIndex; - uint16_t wLength; + u8 bRequestType; + u8 bRequest; + u16 wValue; + u16 wIndex; + u16 wLength; } __attribute__ ((packed)); struct usb_debug_descriptor { - uint8_t bLength; - uint8_t bDescriptorType; + u8 bLength; + u8 bDescriptorType; /* bulk endpoints with 8 byte maxpacket */ - uint8_t bDebugInEndpoint; - uint8_t bDebugOutEndpoint; + u8 bDebugInEndpoint; + u8 bDebugOutEndpoint; }; #endif Modified: trunk/src/include/usbdebug_direct.h ============================================================================== --- trunk/src/include/usbdebug_direct.h Tue May 25 18:00:08 2010 (r5584) +++ trunk/src/include/usbdebug_direct.h Tue May 25 18:02:28 2010 (r5585) @@ -15,8 +15,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA */ -#ifndef USBDEBUG_DIRECT_H -#define USBDEBUG_DIRECT_H +#ifndef USBDEBUG_H +#define USBDEBUG_H struct ehci_debug_info { void *ehci_caps; Modified: trunk/src/lib/usbdebug_direct.c ============================================================================== --- trunk/src/lib/usbdebug_direct.c Tue May 25 18:00:08 2010 (r5584) +++ trunk/src/lib/usbdebug_direct.c Tue May 25 18:02:28 2010 (r5585) @@ -342,9 +342,9 @@ #define DBGP_DEBUG 1 #if DBGP_DEBUG -# define dbgp_printk(fmt, arg...) printk(BIOS_DEBUG, fmt, arg) +# define dbgp_printk(fmt_arg...) printk(BIOS_DEBUG, fmt_arg) #else -#define dbgp_printk(fmt, arg...) do {} while(0) +#define dbgp_printk(fmt_arg...) do {} while(0) #endif static void usbdebug_direct_init(unsigned ehci_bar, unsigned offset, struct ehci_debug_info *info) { @@ -531,7 +531,7 @@ /* Things didn't work so remove my claim */ ctrl = read32(&ehci_debug->control); ctrl &= ~(DBGP_CLAIM | DBGP_OUT); - write32(&ehci_debug->control, ctrl); + write32((unsigned long)&ehci_debug->control, ctrl); next_debug_port: port_map_tried |= (1<<(debug_port-1)); Modified: trunk/src/mainboard/kontron/986lcd-m/romstage.c ============================================================================== --- trunk/src/mainboard/kontron/986lcd-m/romstage.c Tue May 25 18:00:08 2010 (r5584) +++ trunk/src/mainboard/kontron/986lcd-m/romstage.c Tue May 25 18:02:28 2010 (r5585) @@ -50,6 +50,7 @@ #if CONFIG_USBDEBUG_DIRECT #define DBGP_DEFAULT 1 +#include <usbdebug_direct.h> #include "southbridge/intel/i82801gx/i82801gx_usb_debug.c" #include "pc80/usbdebug_direct_serial.c" #endif -- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
