Changeset c7137738 in mainline


Ignore:
Timestamp:
2010-11-15T14:52:43Z (13 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.

Files:
10 added
5 edited

Legend:

Unmodified
Added
Removed

  • .bzrignore

    r7494fb4 rc7137738  
    9393./uspace/dist/drv/root/
    9494./uspace/dist/drv/rootia32/
     95./uspace/dist/drv/uhci/
     96./uspace/dist/drv/usbkbd/
    9597./uspace/dist/srv/arp
    9698./uspace/dist/srv/ata_bd
    … …  
    126128./uspace/drv/pciintel/pciintel
    127129./uspace/drv/rootia32/rootia32
     130./uspace/drv/uhci/uhci
     131./uspace/drv/usbkbd/usbkbd
    128132./uspace/srv/bd/ata_bd/ata_bd
    129133./uspace/srv/bd/file_bd/file_bd

  • boot/arch/amd64/Makefile.inc

    r7494fb4 rc7137738  
    4040        pciintel \
    4141        isa \
    42         ns8250
     42        ns8250 \
     43        uhci \
     44        usbkbd
    4345       
    4446RD_DRV_CFG += \

  • uspace/Makefile

    r7494fb4 rc7137738  
    120120        DIRS += drv/isa
    121121        DIRS += drv/ns8250
     122        DIRS += drv/uhci
     123        DIRS += drv/usbkbd
    122124endif
    123125

  • uspace/lib/usb/Makefile

    r7494fb4 rc7137738  
    2929USPACE_PREFIX = ../..
    3030LIBRARY = libusb
     31LIBS = $(LIBDRV_PREFIX)/libdrv.a
     32EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
    3133
    3234SOURCES = \
    3335        hcd.c \
    34         usb.c
     36        hcdhubd.c \
     37        usb.c \
     38        usbdrv.c
    3539
    3640include $(USPACE_PREFIX)/Makefile.common

  • uspace/lib/usb/hcd.c

    r7494fb4 rc7137738  
    5858#define NAMESPACE "usb"
    5959
    60 /** String representation for USB transfer type. */
    61 const char * usb_str_transfer_type(usb_transfer_type_t t)
    62 {
    63         switch (t) {
    64                 case USB_TRANSFER_ISOCHRONOUS:
    65                         return "isochronous";
    66                 case USB_TRANSFER_INTERRUPT:
    67                         return "interrupt";
    68                 case USB_TRANSFER_CONTROL:
    69                         return "control";
    70                 case USB_TRANSFER_BULK:
    71                         return "bulk";
    72                 default:
    73                         return "unknown";
    74         }
    75 }
    7660
    7761/** String representation of USB transaction outcome. */
Note: See TracChangeset for help on using the changeset viewer.