Changeset 53b9f2c in mainline for uspace

Timestamp:

2017-11-12T00:23:46Z (8 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.

Location:

uspace

Files:

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

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