Changeset 5119d34 in mainline

Timestamp:

2017-06-08T15:52:16Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

f4eb6c93

Parents:

b942a66

Message:

Added XHCI driver skeleton

Files:

• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• tools/ew.py (modified) (5 diffs)
• uspace/Makefile (modified) (1 diff)
• uspace/drv/bus/usb/xhci/Makefile (added)
• uspace/drv/bus/usb/xhci/main.c (added)
• uspace/drv/bus/usb/xhci/xhci.ma (added)

boot/arch/amd64/Makefile.inc

@@ -56 +56 @@
         bus/usb/usbmast \
         bus/usb/usbmid \
-        bus/usb/vhc
+        bus/usb/vhc \
+        bus/usb/xhci
 
 RD_DRV_CFG += \

tools/ew.py

@@ -160 +160 @@
         return ' -usb'
 
+def qemu_xhci_options():
+        if is_override('noxhci'):
+                return ''
+        return ' -device nec-usb-xhci,id=xhci'
+
 def qemu_audio_options():
         if is_override('nosnd'):
@@ -180 +185 @@
         if (not 'usb' in cfg.keys()) or cfg['usb']:
                 cmdline += qemu_usb_options()
+        if (not 'xhci' in cfg.keys()) or cfg['xhci']:
+                cmdline += qemu_xhci_options()
         if (not 'audio' in cfg.keys()) or cfg['audio']:
                 cmdline += qemu_audio_options()
@@ -286 +293 @@
 def usage():
         print("%s - emulator wrapper for running HelenOS\n" % os.path.basename(sys.argv[0]))
-        print("%s [-d] [-h] [-net e1k|rtl8139|ne2k] [-nohdd] [-nokvm] [-nonet] [-nosnd] [-nousb]\n" %
+        print("%s [-d] [-h] [-net e1k|rtl8139|ne2k] [-nohdd] [-nokvm] [-nonet] [-nosnd] [-nousb] [-noxhci]\n" %
             os.path.basename(sys.argv[0]))
         print("-d\tDry run: do not run the emulation, just print the command line.")
@@ -295 +302 @@
         print("-nosnd\tDisable sound, if applicable.")
         print("-nousb\tDisable USB support, if applicable.")
+        print("-noxhci\tDisable XHCI support, if applicable.")
 
 def fail(platform, machine):
@@ -336 +344 @@
                 elif sys.argv[i] == '-nousb':
                         overrides['nousb'] = True
+                elif sys.argv[i] == '-noxhci':
+                        overrides['noxhci'] = True
                 else:
                         usage()

uspace/Makefile

@@ -159 +159 @@
         drv/bus/usb/usbmid \
         drv/bus/usb/vhc \
+        drv/bus/usb/xhci \
         drv/nic/ne2k \
         drv/nic/e1k \