Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 53b9f2c in mainline


Ignore:
Timestamp:
2017-11-12T00:23:46Z (3 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
master
Children:
493f1be
Parents:
6da15db7
Message:

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

Files:
6 edited
33 moved

Legend:

Unmodified
Added
Removed
  • .bzrignore

    r6da15db7 r53b9f2c  
    281281uspace/drv/block/ata_bd/ata_bd
    282282uspace/drv/block/ddisk/ddisk
     283uspace/drv/block/usbmast/usbmast
    283284uspace/drv/bus/adb/cuda_adb/cuda_adb
    284285uspace/drv/bus/isa/isa
     
    288289uspace/drv/bus/usb/uhci/uhci
    289290uspace/drv/bus/usb/usbflbk/usbflbk
    290 uspace/drv/bus/usb/usbhid/usbhid
    291291uspace/drv/bus/usb/usbhub/usbhub
    292 uspace/drv/bus/usb/usbmast/usbmast
    293292uspace/drv/bus/usb/usbmid/usbmid
    294293uspace/drv/bus/usb/vhc/vhc
     
    304303uspace/drv/hid/xtkbd/xtkbd
    305304uspace/drv/hid/ps2mouse/ps2mouse
     305uspace/drv/hid/usbhid/usbhid
    306306uspace/drv/intctl/apic/apic
    307307uspace/drv/intctl/i8259/i8259
  • boot/arch/amd64/Makefile.inc

    r6da15db7 r53b9f2c  
    5151        bus/usb/usbflbk \
    5252        bus/usb/usbhub \
    53         bus/usb/usbhid \
    54         bus/usb/usbmast \
    5553        bus/usb/usbmid \
    56         bus/usb/vhc
     54        bus/usb/vhc \
     55        block/usbmast \
     56        hid/usbhid
    5757
    5858RD_DRV_CFG += \
  • boot/arch/arm32/Makefile.inc

    r6da15db7 r53b9f2c  
    8585        bus/usb/usbflbk \
    8686        bus/usb/usbhub \
    87         bus/usb/usbhid \
    88         bus/usb/usbmast \
    89         bus/usb/usbmid
     87        bus/usb/usbmid \
     88        block/usbmast \
     89        hid/usbhid
    9090
    9191SOURCES = \
  • boot/arch/ia64/Makefile.inc

    r6da15db7 r53b9f2c  
    8282        bus/usb/usbflbk \
    8383        bus/usb/usbhub \
    84         bus/usb/usbhid \
    85         bus/usb/usbmast \
    8684        bus/usb/usbmid \
    87         bus/usb/vhc
     85        bus/usb/vhc \
     86        block/usbmast \
     87        hid/usbhid
    8888
    8989RD_DRV_CFG += \
  • boot/arch/ppc32/Makefile.inc

    r6da15db7 r53b9f2c  
    4949        bus/usb/usbflbk \
    5050        bus/usb/usbhub \
    51         bus/usb/usbhid \
    52         bus/usb/usbmast \
    5351        bus/usb/usbmid \
    54         bus/usb/vhc
     52        bus/usb/vhc \
     53        block/usbmast \
     54        hid/usbhid
    5555
    5656SOURCES = \
  • uspace/Makefile

    r6da15db7 r53b9f2c  
    143143        drv/block/ata_bd \
    144144        drv/block/ddisk \
     145        drv/block/usbmast \
    145146        drv/bus/adb/cuda_adb \
    146147        drv/bus/isa \
     
    150151        drv/bus/usb/uhci \
    151152        drv/bus/usb/usbflbk \
    152         drv/bus/usb/usbhid \
    153153        drv/bus/usb/usbhub \
    154         drv/bus/usb/usbmast \
    155154        drv/bus/usb/usbmid \
    156155        drv/bus/usb/vhc \
     
    161160        drv/char/ski-con \
    162161        drv/char/sun4v-con \
    163         drv/test/test1 \
    164         drv/test/test2 \
    165         drv/test/test3 \
    166162        drv/fb/amdm37x_dispc \
    167163        drv/fb/kfb \
    168164        drv/hid/atkbd \
    169165        drv/hid/ps2mouse \
     166        drv/hid/usbhid \
    170167        drv/hid/xtkbd \
    171168        drv/intctl/apic \
     
    186183        drv/platform/ski \
    187184        drv/platform/sun4v \
     185        drv/test/test1 \
     186        drv/test/test2 \
     187        drv/test/test3 \
    188188        drv/time/cmos-rtc
    189189
  • uspace/drv/block/usbmast/Makefile

    r6da15db7 r53b9f2c  
    2727#
    2828
    29 USPACE_PREFIX = ../../../..
     29USPACE_PREFIX = ../../..
    3030
    3131LIBS = usbdev usb drv scsi
  • uspace/drv/hid/usbhid/Makefile

    r6da15db7 r53b9f2c  
    2727#
    2828
    29 USPACE_PREFIX = ../../../..
     29USPACE_PREFIX = ../../..
    3030
    3131LIBS = usbhid usbdev usb drv
Note: See TracChangeset for help on using the changeset viewer.