GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix usbdebug compilation. 

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5585 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2010-05-25 16:02:28 +00:00 committed by Stefan Reinauer
parent 2b01a8a5cd
commit 56394484e3
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/include/usb_ch9.h
View File

@ -61,22 +61,21 @@
#define USB_DEVICE_DEBUG_MODE 6 /* (special devices only) */ #define USB_DEVICE_DEBUG_MODE 6 /* (special devices only) */
//frim usb_ch9.h
struct usb_ctrlrequest { struct usb_ctrlrequest {
uint8_t bRequestType; u8 bRequestType;
uint8_t bRequest; u8 bRequest;
uint16_t wValue; u16 wValue;
uint16_t wIndex; u16 wIndex;
uint16_t wLength; u16 wLength;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct usb_debug_descriptor { struct usb_debug_descriptor {
uint8_t bLength; u8 bLength;
uint8_t bDescriptorType; u8 bDescriptorType;
/* bulk endpoints with 8 byte maxpacket */ /* bulk endpoints with 8 byte maxpacket */
uint8_t bDebugInEndpoint; u8 bDebugInEndpoint;
uint8_t bDebugOutEndpoint; u8 bDebugOutEndpoint;
}; };
#endif #endif

4
src/include/usbdebug_direct.h
View File

@ -15,8 +15,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
*/ */
#ifndef USBDEBUG_DIRECT_H #ifndef USBDEBUG_H
#define USBDEBUG_DIRECT_H #define USBDEBUG_H
struct ehci_debug_info { struct ehci_debug_info {
void *ehci_caps; void *ehci_caps;

6
src/lib/usbdebug_direct.c
View File

@ -342,9 +342,9 @@ static int ehci_wait_for_port(struct ehci_regs *ehci_regs, int port)
#define DBGP_DEBUG 1 #define DBGP_DEBUG 1
#if DBGP_DEBUG #if DBGP_DEBUG
# define dbgp_printk(fmt, arg...) printk(BIOS_DEBUG, fmt, arg) # define dbgp_printk(fmt_arg...) printk(BIOS_DEBUG, fmt_arg)
#else #else
#define dbgp_printk(fmt, arg...) do {} while(0) #define dbgp_printk(fmt_arg...) do {} while(0)
#endif #endif
static void usbdebug_direct_init(unsigned ehci_bar, unsigned offset, struct ehci_debug_info *info) static void usbdebug_direct_init(unsigned ehci_bar, unsigned offset, struct ehci_debug_info *info)
{ {
@ -531,7 +531,7 @@ err:
/* Things didn't work so remove my claim */ /* Things didn't work so remove my claim */
ctrl = read32(&ehci_debug->control); ctrl = read32(&ehci_debug->control);
ctrl &= ~(DBGP_CLAIM | DBGP_OUT); ctrl &= ~(DBGP_CLAIM | DBGP_OUT);
write32(&ehci_debug->control, ctrl); write32((unsigned long)&ehci_debug->control, ctrl);
next_debug_port: next_debug_port:
port_map_tried |= (1<<(debug_port-1)); port_map_tried |= (1<<(debug_port-1));

1
src/mainboard/kontron/986lcd-m/romstage.c
View File

@ -50,6 +50,7 @@
#if CONFIG_USBDEBUG_DIRECT #if CONFIG_USBDEBUG_DIRECT
#define DBGP_DEFAULT 1 #define DBGP_DEFAULT 1
#include <usbdebug_direct.h>
#include "southbridge/intel/i82801gx/i82801gx_usb_debug.c" #include "southbridge/intel/i82801gx/i82801gx_usb_debug.c"
#include "pc80/usbdebug_direct_serial.c" #include "pc80/usbdebug_direct_serial.c"
#endif #endif