Changeset 37ac7bb in mainline

Timestamp:

2011-01-31T17:38:26Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1256a0a

Parents:

72e19f50

Message:

Renames "uhci"→"uhci-hcd" to prepare RH drier separation

Files:

• .bzrignore (modified) (1 diff)
• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (2 diffs)
• uspace/drv/uhci-hcd/Makefile (moved) (moved from uspace/drv/uhci/Makefile ) (1 diff)
• uspace/drv/uhci-hcd/callback.c (moved) (moved from uspace/drv/uhci/callback.c )
• uspace/drv/uhci-hcd/callback.h (moved) (moved from uspace/drv/uhci/callback.h )
• uspace/drv/uhci-hcd/debug.h (moved) (moved from uspace/drv/uhci/debug.h )
• uspace/drv/uhci-hcd/iface.c (moved) (moved from uspace/drv/uhci/iface.c )
• uspace/drv/uhci-hcd/iface.h (moved) (moved from uspace/drv/uhci/iface.h )
• uspace/drv/uhci-hcd/main.c (moved) (moved from uspace/drv/uhci/main.c )
• uspace/drv/uhci-hcd/name.h (moved) (moved from uspace/drv/uhci/name.h ) (1 diff)
• uspace/drv/uhci-hcd/pci.c (moved) (moved from uspace/drv/uhci/pci.c )
• uspace/drv/uhci-hcd/root_hub/debug.h (moved) (moved from uspace/drv/uhci/root_hub/debug.h )
• uspace/drv/uhci-hcd/root_hub/port.c (moved) (moved from uspace/drv/uhci/root_hub/port.c )
• uspace/drv/uhci-hcd/root_hub/port.h (moved) (moved from uspace/drv/uhci/root_hub/port.h )
• uspace/drv/uhci-hcd/root_hub/port_status.c (moved) (moved from uspace/drv/uhci/root_hub/port_status.c )
• uspace/drv/uhci-hcd/root_hub/port_status.h (moved) (moved from uspace/drv/uhci/root_hub/port_status.h )
• uspace/drv/uhci-hcd/root_hub/root_hub.c (moved) (moved from uspace/drv/uhci/root_hub/root_hub.c )
• uspace/drv/uhci-hcd/root_hub/root_hub.h (moved) (moved from uspace/drv/uhci/root_hub/root_hub.h )
• uspace/drv/uhci-hcd/transfer_list.c (moved) (moved from uspace/drv/uhci/transfer_list.c )
• uspace/drv/uhci-hcd/transfer_list.h (moved) (moved from uspace/drv/uhci/transfer_list.h )
• uspace/drv/uhci-hcd/uhci-hcd.ma (moved) (moved from uspace/drv/uhci/uhci.ma )
• uspace/drv/uhci-hcd/uhci.c (moved) (moved from uspace/drv/uhci/uhci.c )
• uspace/drv/uhci-hcd/uhci.h (moved) (moved from uspace/drv/uhci/uhci.h )
• uspace/drv/uhci-hcd/uhci_struct/link_pointer.h (moved) (moved from uspace/drv/uhci/uhci_struct/link_pointer.h )
• uspace/drv/uhci-hcd/uhci_struct/queue_head.h (moved) (moved from uspace/drv/uhci/uhci_struct/queue_head.h )
• uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c (moved) (moved from uspace/drv/uhci/uhci_struct/transfer_descriptor.c )
• uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.h (moved) (moved from uspace/drv/uhci/uhci_struct/transfer_descriptor.h )
• uspace/drv/uhci-hcd/utils/malloc32.h (moved) (moved from uspace/drv/uhci/utils/malloc32.h )

.bzrignore

@@ -84 +84 @@
 ./uspace/drv/test1/test1
 ./uspace/drv/test2/test2
-./uspace/drv/uhci/uhci
+./uspace/drv/uhci-hcd/uhci-hcd
 ./uspace/drv/usbhub/usbhub
 ./uspace/drv/usbhid/usbhid

boot/arch/amd64/Makefile.inc

@@ -43 +43 @@
         isa \
         ns8250 \
-        uhci \
+        uhci-hcd \
         usbhub \
         usbhid \

uspace/Makefile

@@ -117 +117 @@
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259 \
-                drv/uhci \
+                drv/uhci-hcd \
                 drv/usbhid \
                 drv/usbhub \
@@ -131 +131 @@
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259 \
-                drv/uhci \
+                drv/uhci-hcd \
                 drv/usbhid \
                 drv/usbhub \

uspace/drv/uhci-hcd/Makefile

@@ -30 +30 @@
 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBUSB_PREFIX)/libusb.a
 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBUSB_PREFIX)/include -I.
-BINARY = uhci
+BINARY = uhci-hcd
 
 SOURCES = \

uspace/drv/uhci-hcd/name.h

@@ -35 +35 @@
 #define DRV_UHCI_TD_NAME_H
 
-#define NAME "uhci"
+#define NAME "uhci-hcd"
 
 #endif