Changeset df6ded8 in mainline for tools/ew.py

Timestamp:

2018-02-28T16:37:50Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1b20da0

Parents:

f5e5f73 (diff), b2dca8de (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jakub Jermar <jakub@…> (2018-02-28 16:06:42)

git-committer:

Jakub Jermar <jakub@…> (2018-02-28 16:37:50)

Message:

Merge github.com:helenos-xhci-team/helenos

This commit merges support for USB 3 and generally refactors, fixes,
extends and cleans up the existing USB framework.

Notable additions and features:

• new host controller driver has been implemented to control various xHC models (among others, NEC Renesas uPD720200)
• isochronous data transfer mode
• support for explicit USB device removal
• USB tablet driver

File:

• tools/ew.py (modified) (8 diffs)

tools/ew.py

@@ -169 +169 @@
         return ' -usb'
 
+def qemu_xhci_options():
+        if is_override('noxhci'):
+                return ''
+        return ' -device nec-usb-xhci,id=xhci'
+
+def qemu_tablet_options():
+        if is_override('notablet') or (is_override('nousb') and is_override('noxhci')):
+                return ''
+        return ' -device usb-tablet'
+
 def qemu_audio_options():
         if is_override('nosnd'):
@@ -180 +190 @@
 
         cmdline = cmd
+        if 'qemu_path' in overrides.keys():
+                cmdline = overrides['qemu_path'] + cmd
+
         if options != '':
                 cmdline += ' ' + options
@@ -189 +202 @@
         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 'tablet' in cfg.keys()) or cfg['tablet']:
+                cmdline += qemu_tablet_options()
         if (not 'audio' in cfg.keys()) or cfg['audio']:
                 cmdline += qemu_audio_options()
@@ -297 +314 @@
 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] [-notablet]\n" %
             os.path.basename(sys.argv[0]))
         print("-d\tDry run: do not run the emulation, just print the command line.")
@@ -306 +323 @@
         print("-nosnd\tDisable sound, if applicable.")
         print("-nousb\tDisable USB support, if applicable.")
+        print("-noxhci\tDisable XHCI support, if applicable.")
+        print("-notablet\tDisable USB tablet (use only relative-position PS/2 mouse instead), if applicable.")
 
 def fail(platform, machine):
@@ -313 +332 @@
 def run():
         expect_nic = False
+        expect_qemu = False
 
         for i in range(1, len(sys.argv)):
@@ -329 +349 @@
                                 usage()
                                 exit()
+
+                if expect_qemu:
+                        expect_qemu = False
+                        overrides['qemu_path'] = sys.argv[i]
 
                 elif sys.argv[i] == '-h':
@@ -347 +371 @@
                 elif sys.argv[i] == '-nousb':
                         overrides['nousb'] = True
+                elif sys.argv[i] == '-noxhci':
+                        overrides['noxhci'] = True
+                elif sys.argv[i] == '-notablet':
+                        overrides['notablet'] = True
+                elif sys.argv[i] == '-qemu_path' and i < len(sys.argv) - 1:
+                        expect_qemu = True
                 else:
                         usage()