Changeset 476b71ff in mainline


Ignore:
Timestamp:
2011-03-24T20:44:27Z (14 years ago)
Author:
Lubos Slovak <lubos.slovak@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
252e30c
Parents:
61825f9
Message:

Finished renaming kbd driver to usbkbd

Files:
6 edited
3 moved

Legend:

Unmodified
Added
Removed

  • boot/arch/amd64/Makefile.inc

    r61825f9 r476b71ff  
    4949        usbflbk \
    5050        usbhub \
    51         usbhid \
     51        usbkbd \
    5252        usbmid \
    5353        usbmouse \

  • uspace/Makefile

    r61825f9 r476b71ff  
    122122                drv/uhci-rhd \
    123123                drv/usbflbk \
    124                 drv/usbhid \
     124                drv/usbkbd \
    125125                drv/usbhub \
    126126                drv/usbmid \
    … …  
    142142                drv/uhci-rhd \
    143143                drv/usbflbk \
    144                 drv/usbhid \
     144                drv/usbkbd \
    145145                drv/usbhub \
    146146                drv/usbmid \

  • uspace/drv/usbkbd/Makefile

    r61825f9 r476b71ff  
    3030LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBUSB_PREFIX)/libusb.a
    3131EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBUSB_PREFIX)/include -I.
    32 BINARY = usbhid
     32BINARY = usbkbd
    3333
    3434STOLEN_LAYOUT_SOURCES = \
    … …  
    4040        main.c \
    4141        conv.c \
    42         hidreq.c \
    4342        kbddev.c \
    4443        kbdrepeat.c \

  • uspace/drv/usbkbd/kbddev.c

    r61825f9 r476b71ff  
    5454#include <usb/classes/classes.h>
    5555#include <usb/classes/hidut.h>
     56#include <usb/classes/hidreq.h>
    5657
    5758#include <usb/devdrv.h>
    5859
    5960#include "kbddev.h"
    60 #include "hidreq.h"
     61
    6162#include "layout.h"
    6263#include "conv.h"

  • uspace/drv/usbkbd/main.c

    r61825f9 r476b71ff  
    4848/*----------------------------------------------------------------------------*/
    4949
    50 #define NAME "usbhid"
     50#define NAME "usbkbd"
    5151
    5252/**

  • uspace/lib/usb/Makefile

    r61825f9 r476b71ff  
    5050        src/usb.c \
    5151        src/usbdevice.c \
     52        src/hidreq.c \
    5253        src/host/device_keeper.c \
    5354        src/host/batch.c

  • uspace/lib/usb/src/hidreq.c

    r61825f9 r476b71ff  
    4343#include <usb/pipes.h>
    4444
    45 #include "hidreq.h"
     45#include <usb/classes/hidreq.h>
    4646
    4747/*----------------------------------------------------------------------------*/
Note: See TracChangeset for help on using the changeset viewer.