Changeset 66d5062 in mainline

Timestamp:

2011-01-28T21:17:51Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

632ed68

Parents:

1c13dac

Message:

Rename usbkbd' driver to usbhid'

Files:

• .bzrignore (modified) (1 diff)
• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (2 diffs)
• uspace/drv/usbhid/Makefile (moved) (moved from uspace/drv/usbkbd/Makefile ) (2 diffs)
• uspace/drv/usbhid/conv.c (moved) (moved from uspace/drv/usbkbd/conv.c )
• uspace/drv/usbhid/conv.h (moved) (moved from uspace/drv/usbkbd/conv.h )
• uspace/drv/usbhid/descdump.c (moved) (moved from uspace/drv/usbkbd/descdump.c )
• uspace/drv/usbhid/descdump.h (moved) (moved from uspace/drv/usbkbd/descdump.h )
• uspace/drv/usbhid/descparser.c (moved) (moved from uspace/drv/usbkbd/descparser.c )
• uspace/drv/usbhid/descparser.h (moved) (moved from uspace/drv/usbkbd/descparser.h )
• uspace/drv/usbhid/kbd.h (moved) (moved from uspace/drv/usbkbd/kbd.h )
• uspace/drv/usbhid/layout.h (moved) (moved from uspace/drv/usbkbd/layout.h )
• uspace/drv/usbhid/main.c (moved) (moved from uspace/drv/usbkbd/main.c ) (1 diff)
• uspace/drv/usbhid/usbhid.ma (moved) (moved from uspace/drv/usbkbd/usbkbd.ma )

.bzrignore

@@ -86 +86 @@
 ./uspace/drv/uhci/uhci
 ./uspace/drv/usbhub/usbhub
-./uspace/drv/usbkbd/usbkbd
+./uspace/drv/usbhid/usbhid
 ./uspace/drv/vhc/vhc
 ./uspace/srv/bd/ata_bd/ata_bd

boot/arch/amd64/Makefile.inc

@@ -45 +45 @@
         uhci \
         usbhub \
-        usbkbd \
+        usbhid \
         vhc
 

uspace/Makefile

@@ -118 +118 @@
                 srv/hw/irc/i8259 \
                 drv/uhci \
+                drv/usbhid \
                 drv/usbhub \
-                drv/usbkbd \
                 drv/vhc
 endif
@@ -132 +132 @@
                 srv/hw/irc/i8259 \
                 drv/uhci \
+                drv/usbhid \
                 drv/usbhub \
-                drv/usbkbd \
                 drv/vhc
 endif

uspace/drv/usbhid/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2010 Vojtech Horky
+# Copyright (c) 2010-2011 Vojtech Horky
 # All rights reserved.
 #
@@ -30 +30 @@
 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBUSB_PREFIX)/libusb.a
 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBUSB_PREFIX)/include -I.
-BINARY = usbkbd
+BINARY = usbhid
 
 STOLEN_LAYOUT_SOURCES = \

uspace/drv/usbhid/main.c

@@ -55 +55 @@
 
 #define BUFFER_SIZE 32
-#define NAME "usbkbd"
+#define NAME "usbhid"
 
 #define GUESSED_POLL_ENDPOINT 1