Changeset 53b9f2c in mainline

Timestamp:

2017-11-12T00:23:46Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

493f1be

Parents:

6da15db7

Message:

Move usbhid and usbmast alongide hid and block drivers, respectively.

Files:

• .bzrignore (modified) (3 diffs)
• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• boot/arch/arm32/Makefile.inc (modified) (1 diff)
• boot/arch/ia64/Makefile.inc (modified) (1 diff)
• boot/arch/ppc32/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (4 diffs)
• uspace/drv/block/usbmast/Makefile (moved) (moved from uspace/drv/bus/usb/usbmast/Makefile ) (1 diff)
• uspace/drv/block/usbmast/bo_trans.c (moved) (moved from uspace/drv/bus/usb/usbmast/bo_trans.c )
• uspace/drv/block/usbmast/bo_trans.h (moved) (moved from uspace/drv/bus/usb/usbmast/bo_trans.h )
• uspace/drv/block/usbmast/cmdw.c (moved) (moved from uspace/drv/bus/usb/usbmast/cmdw.c )
• uspace/drv/block/usbmast/cmdw.h (moved) (moved from uspace/drv/bus/usb/usbmast/cmdw.h )
• uspace/drv/block/usbmast/main.c (moved) (moved from uspace/drv/bus/usb/usbmast/main.c )
• uspace/drv/block/usbmast/scsi_ms.c (moved) (moved from uspace/drv/bus/usb/usbmast/scsi_ms.c )
• uspace/drv/block/usbmast/scsi_ms.h (moved) (moved from uspace/drv/bus/usb/usbmast/scsi_ms.h )
• uspace/drv/block/usbmast/usbmast.h (moved) (moved from uspace/drv/bus/usb/usbmast/usbmast.h )
• uspace/drv/block/usbmast/usbmast.ma (moved) (moved from uspace/drv/bus/usb/usbmast/usbmast.ma )
• uspace/drv/hid/usbhid/Makefile (moved) (moved from uspace/drv/bus/usb/usbhid/Makefile ) (1 diff)
• uspace/drv/hid/usbhid/blink1/blink1.c (moved) (moved from uspace/drv/bus/usb/usbhid/blink1/blink1.c )
• uspace/drv/hid/usbhid/blink1/blink1.h (moved) (moved from uspace/drv/bus/usb/usbhid/blink1/blink1.h )
• uspace/drv/hid/usbhid/generic/hiddev.c (moved) (moved from uspace/drv/bus/usb/usbhid/generic/hiddev.c )
• uspace/drv/hid/usbhid/generic/hiddev.h (moved) (moved from uspace/drv/bus/usb/usbhid/generic/hiddev.h )
• uspace/drv/hid/usbhid/kbd/conv.c (moved) (moved from uspace/drv/bus/usb/usbhid/kbd/conv.c )
• uspace/drv/hid/usbhid/kbd/conv.h (moved) (moved from uspace/drv/bus/usb/usbhid/kbd/conv.h )
• uspace/drv/hid/usbhid/kbd/kbddev.c (moved) (moved from uspace/drv/bus/usb/usbhid/kbd/kbddev.c )
• uspace/drv/hid/usbhid/kbd/kbddev.h (moved) (moved from uspace/drv/bus/usb/usbhid/kbd/kbddev.h )
• uspace/drv/hid/usbhid/kbd/kbdrepeat.c (moved) (moved from uspace/drv/bus/usb/usbhid/kbd/kbdrepeat.c )
• uspace/drv/hid/usbhid/kbd/kbdrepeat.h (moved) (moved from uspace/drv/bus/usb/usbhid/kbd/kbdrepeat.h )
• uspace/drv/hid/usbhid/main.c (moved) (moved from uspace/drv/bus/usb/usbhid/main.c )
• uspace/drv/hid/usbhid/mouse/mousedev.c (moved) (moved from uspace/drv/bus/usb/usbhid/mouse/mousedev.c )
• uspace/drv/hid/usbhid/mouse/mousedev.h (moved) (moved from uspace/drv/bus/usb/usbhid/mouse/mousedev.h )
• uspace/drv/hid/usbhid/multimedia/keymap.c (moved) (moved from uspace/drv/bus/usb/usbhid/multimedia/keymap.c )
• uspace/drv/hid/usbhid/multimedia/keymap.h (moved) (moved from uspace/drv/bus/usb/usbhid/multimedia/keymap.h )
• uspace/drv/hid/usbhid/multimedia/multimedia.c (moved) (moved from uspace/drv/bus/usb/usbhid/multimedia/multimedia.c )
• uspace/drv/hid/usbhid/multimedia/multimedia.h (moved) (moved from uspace/drv/bus/usb/usbhid/multimedia/multimedia.h )
• uspace/drv/hid/usbhid/subdrivers.c (moved) (moved from uspace/drv/bus/usb/usbhid/subdrivers.c )
• uspace/drv/hid/usbhid/subdrivers.h (moved) (moved from uspace/drv/bus/usb/usbhid/subdrivers.h )
• uspace/drv/hid/usbhid/usbhid.c (moved) (moved from uspace/drv/bus/usb/usbhid/usbhid.c )
• uspace/drv/hid/usbhid/usbhid.h (moved) (moved from uspace/drv/bus/usb/usbhid/usbhid.h )
• uspace/drv/hid/usbhid/usbhid.ma (moved) (moved from uspace/drv/bus/usb/usbhid/usbhid.ma )

.bzrignore

@@ -281 +281 @@
 uspace/drv/block/ata_bd/ata_bd
 uspace/drv/block/ddisk/ddisk
+uspace/drv/block/usbmast/usbmast
 uspace/drv/bus/adb/cuda_adb/cuda_adb
 uspace/drv/bus/isa/isa
@@ -288 +289 @@
 uspace/drv/bus/usb/uhci/uhci
 uspace/drv/bus/usb/usbflbk/usbflbk
-uspace/drv/bus/usb/usbhid/usbhid
 uspace/drv/bus/usb/usbhub/usbhub
-uspace/drv/bus/usb/usbmast/usbmast
 uspace/drv/bus/usb/usbmid/usbmid
 uspace/drv/bus/usb/vhc/vhc
@@ -304 +303 @@
 uspace/drv/hid/xtkbd/xtkbd
 uspace/drv/hid/ps2mouse/ps2mouse
+uspace/drv/hid/usbhid/usbhid
 uspace/drv/intctl/apic/apic
 uspace/drv/intctl/i8259/i8259

boot/arch/amd64/Makefile.inc

@@ -51 +51 @@
         bus/usb/usbflbk \
         bus/usb/usbhub \
-        bus/usb/usbhid \
-        bus/usb/usbmast \
         bus/usb/usbmid \
-        bus/usb/vhc
+        bus/usb/vhc \
+        block/usbmast \
+        hid/usbhid
 
 RD_DRV_CFG += \

boot/arch/arm32/Makefile.inc

@@ -85 +85 @@
         bus/usb/usbflbk \
         bus/usb/usbhub \
-        bus/usb/usbhid \
-        bus/usb/usbmast \
-        bus/usb/usbmid
+        bus/usb/usbmid \
+        block/usbmast \
+        hid/usbhid
 
 SOURCES = \

boot/arch/ia64/Makefile.inc

@@ -82 +82 @@
         bus/usb/usbflbk \
         bus/usb/usbhub \
-        bus/usb/usbhid \
-        bus/usb/usbmast \
         bus/usb/usbmid \
-        bus/usb/vhc
+        bus/usb/vhc \
+        block/usbmast \
+        hid/usbhid
 
 RD_DRV_CFG += \

boot/arch/ppc32/Makefile.inc

@@ -49 +49 @@
         bus/usb/usbflbk \
         bus/usb/usbhub \
-        bus/usb/usbhid \
-        bus/usb/usbmast \
         bus/usb/usbmid \
-        bus/usb/vhc
+        bus/usb/vhc \
+        block/usbmast \
+        hid/usbhid
 
 SOURCES = \

uspace/Makefile

@@ -143 +143 @@
         drv/block/ata_bd \
         drv/block/ddisk \
+        drv/block/usbmast \
         drv/bus/adb/cuda_adb \
         drv/bus/isa \
@@ -150 +151 @@
         drv/bus/usb/uhci \
         drv/bus/usb/usbflbk \
-        drv/bus/usb/usbhid \
         drv/bus/usb/usbhub \
-        drv/bus/usb/usbmast \
         drv/bus/usb/usbmid \
         drv/bus/usb/vhc \
@@ -161 +160 @@
         drv/char/ski-con \
         drv/char/sun4v-con \
-        drv/test/test1 \
-        drv/test/test2 \
-        drv/test/test3 \
         drv/fb/amdm37x_dispc \
         drv/fb/kfb \
         drv/hid/atkbd \
         drv/hid/ps2mouse \
+        drv/hid/usbhid \
         drv/hid/xtkbd \
         drv/intctl/apic \
@@ -186 +183 @@
         drv/platform/ski \
         drv/platform/sun4v \
+        drv/test/test1 \
+        drv/test/test2 \
+        drv/test/test3 \
         drv/time/cmos-rtc
 

uspace/drv/block/usbmast/Makefile

@@ -27 +27 @@
 #
 
-USPACE_PREFIX = ../../../..
+USPACE_PREFIX = ../../..
 
 LIBS = usbdev usb drv scsi

uspace/drv/hid/usbhid/Makefile

@@ -27 +27 @@
 #
 
-USPACE_PREFIX = ../../../..
+USPACE_PREFIX = ../../..
 
 LIBS = usbhid usbdev usb drv