[PATCH 05/05] Updating scripts for USB Serial Drivers

[Kevin Kirspel]

---
 libbsd.py     |  6 +++++-
 libbsd_waf.py | 30 ++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/libbsd.py b/libbsd.py
index 3aa5610..3129266 100644
--- a/libbsd.py
+++ b/libbsd.py
@@ -796,7 +796,9 @@ def dev_usb_serial(mm):
     mod.addKernelSpaceHeaderFiles(
         [
             'sys/dev/usb/serial/uftdi_reg.h',
+            'sys/dev/usb/serial/umcs.h',
             'sys/dev/usb/serial/usb_serial.h',
+            'sys/dev/usb/uftdiio.h',
         ]
     )
     mod.addKernelSpaceSourceFiles(
@@ -812,6 +814,7 @@ def dev_usb_serial(mm):
             'sys/dev/usb/serial/ugensa.c',
             'sys/dev/usb/serial/uipaq.c',
             'sys/dev/usb/serial/ulpt.c',
+            'sys/dev/usb/serial/umcs.c',
             'sys/dev/usb/serial/umct.c',
             'sys/dev/usb/serial/umodem.c',
             'sys/dev/usb/serial/umoscom.c',
@@ -3017,6 +3020,7 @@ def tests(mm):
     mod.addTest(mm.generator['test']('program01', ['test_main']))
     mod.addTest(mm.generator['test']('commands01', ['test_main']))
     mod.addTest(mm.generator['test']('usb01', ['init'], False))
+    mod.addTest(mm.generator['test']('usbserial01', ['init'], False))
     mod.addTest(mm.generator['test']('loopback01', ['test_main']))
     mod.addTest(mm.generator['test']('netshell01', ['test_main', 'shellconfig'], False))
     mod.addTest(mm.generator['test']('swi01', ['init', 'swi_test']))
@@ -3158,7 +3162,7 @@ def sources(mm):
     #mm.addModule(dev_usb_bluetooth(mm))
     #mm.addModule(dev_usb_input(mm))
     #mm.addModule(dev_usb_mouse(mm))
-    #mm.addModule(dev_usb_serial(mm))
+    mm.addModule(dev_usb_serial(mm))
     mm.addModule(dev_usb_net(mm))
     mm.addModule(dev_usb_wlan(mm))
     mm.addModule(dev_wlan_rtwn(mm))
diff --git a/libbsd_waf.py b/libbsd_waf.py
index 10a7ac9..c73f1dd 100644
--- a/libbsd_waf.py
+++ b/libbsd_waf.py
@@ -907,6 +907,26 @@ def build(bld):
               'freebsd/sys/dev/usb/net/ruephy.c',
               'freebsd/sys/dev/usb/net/usb_ethernet.c',
               'freebsd/sys/dev/usb/quirk/usb_quirk.c',
+              'freebsd/sys/dev/usb/serial/u3g.c',
+              'freebsd/sys/dev/usb/serial/uark.c',
+              'freebsd/sys/dev/usb/serial/ubsa.c',
+              'freebsd/sys/dev/usb/serial/ubser.c',
+              'freebsd/sys/dev/usb/serial/uchcom.c',
+              'freebsd/sys/dev/usb/serial/ucycom.c',
+              'freebsd/sys/dev/usb/serial/ufoma.c',
+              'freebsd/sys/dev/usb/serial/uftdi.c',
+              'freebsd/sys/dev/usb/serial/ugensa.c',
+              'freebsd/sys/dev/usb/serial/uipaq.c',
+              'freebsd/sys/dev/usb/serial/ulpt.c',
+              'freebsd/sys/dev/usb/serial/umcs.c',
+              'freebsd/sys/dev/usb/serial/umct.c',
+              'freebsd/sys/dev/usb/serial/umodem.c',
+              'freebsd/sys/dev/usb/serial/umoscom.c',
+              'freebsd/sys/dev/usb/serial/uplcom.c',
+              'freebsd/sys/dev/usb/serial/usb_serial.c',
+              'freebsd/sys/dev/usb/serial/uslcom.c',
+              'freebsd/sys/dev/usb/serial/uvisor.c',
+              'freebsd/sys/dev/usb/serial/uvscom.c',
               'freebsd/sys/dev/usb/storage/umass.c',
               'freebsd/sys/dev/usb/usb_busdma.c',
               'freebsd/sys/dev/usb/usb_core.c',
@@ -1902,6 +1922,16 @@ def build(bld):
                 lib = ["m", "z"],
                 install_path = None)

+    test_usbserial01 = ['testsuite/usbserial01/init.c']
+    bld.program(target = "usbserial01.exe",
+                features = "cprogram",
+                cflags = cflags,
+                includes = includes,
+                source = test_usbserial01,
+                use = ["bsd"],
+                lib = ["m", "z"],
+                install_path = None)
+
     test_vlan01 = ['testsuite/vlan01/test_main.c']
     bld.program(target = "vlan01.exe",
                 features = "cprogram",
--
1.9.1