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

Changeset 5119d34 in mainline


Ignore:
Timestamp:
2017-06-08T15:52:16Z (3 years ago)
Author:
Ondřej Hlavatý <aearsis@…>
Branches:
master
Children:
f4eb6c93
Parents:
b942a66
Message:

Added XHCI driver skeleton

Files:
3 added
3 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/amd64/Makefile.inc

    rb942a66 r5119d34  
    5656        bus/usb/usbmast \
    5757        bus/usb/usbmid \
    58         bus/usb/vhc
     58        bus/usb/vhc \
     59        bus/usb/xhci
    5960
    6061RD_DRV_CFG += \
  • tools/ew.py

    rb942a66 r5119d34  
    160160        return ' -usb'
    161161
     162def qemu_xhci_options():
     163        if is_override('noxhci'):
     164                return ''
     165        return ' -device nec-usb-xhci,id=xhci'
     166
    162167def qemu_audio_options():
    163168        if is_override('nosnd'):
     
    180185        if (not 'usb' in cfg.keys()) or cfg['usb']:
    181186                cmdline += qemu_usb_options()
     187        if (not 'xhci' in cfg.keys()) or cfg['xhci']:
     188                cmdline += qemu_xhci_options()
    182189        if (not 'audio' in cfg.keys()) or cfg['audio']:
    183190                cmdline += qemu_audio_options()
     
    286293def usage():
    287294        print("%s - emulator wrapper for running HelenOS\n" % os.path.basename(sys.argv[0]))
    288         print("%s [-d] [-h] [-net e1k|rtl8139|ne2k] [-nohdd] [-nokvm] [-nonet] [-nosnd] [-nousb]\n" %
     295        print("%s [-d] [-h] [-net e1k|rtl8139|ne2k] [-nohdd] [-nokvm] [-nonet] [-nosnd] [-nousb] [-noxhci]\n" %
    289296            os.path.basename(sys.argv[0]))
    290297        print("-d\tDry run: do not run the emulation, just print the command line.")
     
    295302        print("-nosnd\tDisable sound, if applicable.")
    296303        print("-nousb\tDisable USB support, if applicable.")
     304        print("-noxhci\tDisable XHCI support, if applicable.")
    297305
    298306def fail(platform, machine):
     
    336344                elif sys.argv[i] == '-nousb':
    337345                        overrides['nousb'] = True
     346                elif sys.argv[i] == '-noxhci':
     347                        overrides['noxhci'] = True
    338348                else:
    339349                        usage()
  • uspace/Makefile

    rb942a66 r5119d34  
    159159        drv/bus/usb/usbmid \
    160160        drv/bus/usb/vhc \
     161        drv/bus/usb/xhci \
    161162        drv/nic/ne2k \
    162163        drv/nic/e1k \
Note: See TracChangeset for help on using the changeset viewer.