Changeset c7137738 in mainline for uspace

Timestamp:

2010-11-15T14:52:43Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3f0a7971

Parents:

7494fb4

Message:

DDF proposal

Proposal for new API using the device driver framework.

Location:

uspace

Files:

• Makefile (modified) (1 diff)
• drv/uhci/Makefile (added)
• drv/uhci/main.c (added)
• drv/uhci/uhci.ma (added)
• drv/usbkbd/Makefile (added)
• drv/usbkbd/main.c (added)
• drv/usbkbd/usbkbd.ma (added)
• lib/usb/Makefile (modified) (1 diff)
• lib/usb/hcd.c (modified) (1 diff)
• lib/usb/hcdhubd.c (added)
• lib/usb/hcdhubd.h (added)
• lib/usb/usbdrv.c (added)
• lib/usb/usbdrv.h (added)

uspace/Makefile

@@ -120 +120 @@
         DIRS += drv/isa
         DIRS += drv/ns8250
+        DIRS += drv/uhci
+        DIRS += drv/usbkbd
 endif
 

uspace/lib/usb/Makefile

@@ -29 +29 @@
 USPACE_PREFIX = ../..
 LIBRARY = libusb
+LIBS = $(LIBDRV_PREFIX)/libdrv.a
+EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
 
 SOURCES = \
         hcd.c \
-        usb.c
+        hcdhubd.c \
+        usb.c \
+        usbdrv.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/usb/hcd.c

@@ -58 +58 @@
 #define NAMESPACE "usb"
 
-/** String representation for USB transfer type. */
-const char * usb_str_transfer_type(usb_transfer_type_t t)
-{
-        switch (t) {
-                case USB_TRANSFER_ISOCHRONOUS:
-                        return "isochronous";
-                case USB_TRANSFER_INTERRUPT:
-                        return "interrupt";
-                case USB_TRANSFER_CONTROL:
-                        return "control";
-                case USB_TRANSFER_BULK:
-                        return "bulk";
-                default:
-                        return "unknown";
-        }
-}
 
 /** String representation of USB transaction outcome. */