[rtems-libbsd commit] Port USB and USB WLAN.

Sebastian Huber sebh at rtems.org
Mon Jan 30 08:44:55 UTC 2017


Module:    rtems-libbsd
Branch:    master
Commit:    59338de0a5dba1bd849ae05fde9985751e98cbea
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=59338de0a5dba1bd849ae05fde9985751e98cbea

Author:    Christian Mauderer <Christian.Mauderer at embedded-brains.de>
Date:      Mon Dec 12 12:23:40 2016 +0100

Port USB and USB WLAN.

---

 freebsd/sys/dev/usb/wlan/if_rsu.c            |  3 +++
 libbsd.py                                    | 39 +++++++++++++++++++++++++---
 libbsd_waf.py                                | 22 ++++++++++++++++
 rtemsbsd/include/rtems/bsd/local/opt_urtwn.h |  0
 4 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/freebsd/sys/dev/usb/wlan/if_rsu.c b/freebsd/sys/dev/usb/wlan/if_rsu.c
index b429a08..201e75f 100644
--- a/freebsd/sys/dev/usb/wlan/if_rsu.c
+++ b/freebsd/sys/dev/usb/wlan/if_rsu.c
@@ -31,6 +31,9 @@ __FBSDID("$FreeBSD$");
 
 #include <rtems/bsd/local/opt_wlan.h>
 
+#ifdef __rtems__
+#define __LINUX_ERRNO_EXTENSIONS__
+#endif /* __rtems__ */
 #include <rtems/bsd/sys/param.h>
 #include <sys/endian.h>
 #include <sys/sockio.h>
diff --git a/libbsd.py b/libbsd.py
index 9707f7b..880ba0d 100755
--- a/libbsd.py
+++ b/libbsd.py
@@ -651,15 +651,38 @@ def dev_usb_net(mm):
     mod.addDependency(mm['dev_usb'])
     mod.addKernelSpaceHeaderFiles(
         [
-            'sys/dev/mii/mii.h',
-            'sys/dev/mii/miivar.h',
+            'sys/dev/usb/net/if_auereg.h',
+            'sys/dev/usb/net/if_axereg.h',
+            'sys/dev/usb/net/if_axgereg.h',
             'sys/dev/usb/net/if_cdcereg.h',
+            'sys/dev/usb/net/if_cuereg.h',
+            'sys/dev/usb/net/if_iphethvar.h',
+            'sys/dev/usb/net/if_kuefw.h',
+            'sys/dev/usb/net/if_kuereg.h',
+            'sys/dev/usb/net/if_mosreg.h',
+            'sys/dev/usb/net/if_ruereg.h',
+            'sys/dev/usb/net/if_smscreg.h',
+            'sys/dev/usb/net/if_udavreg.h',
+            'sys/dev/usb/net/if_urereg.h',
+            'sys/dev/usb/net/ruephyreg.h',
             'sys/dev/usb/net/usb_ethernet.h',
         ]
     )
     mod.addKernelSpaceSourceFiles(
         [
+            'sys/dev/usb/net/if_aue.c',
+            'sys/dev/usb/net/if_axe.c',
+            'sys/dev/usb/net/if_axge.c',
             'sys/dev/usb/net/if_cdce.c',
+            'sys/dev/usb/net/if_cue.c',
+            'sys/dev/usb/net/if_ipheth.c',
+            'sys/dev/usb/net/if_kue.c',
+            'sys/dev/usb/net/if_mos.c',
+            'sys/dev/usb/net/if_rue.c',
+            'sys/dev/usb/net/if_smsc.c',
+            'sys/dev/usb/net/if_udav.c',
+            'sys/dev/usb/net/if_ure.c',
+            'sys/dev/usb/net/ruephy.c',
             'sys/dev/usb/net/usb_ethernet.c',
         ],
         mm.generator['source']()
@@ -787,24 +810,32 @@ def dev_usb_wlan(mm):
     mod.addDependency(mm['dev_usb'])
     mod.addKernelSpaceHeaderFiles(
         [
+            'sys/dev/usb/wlan/if_rsureg.h',
             'sys/dev/usb/wlan/if_rumfw.h',
             'sys/dev/usb/wlan/if_rumreg.h',
             'sys/dev/usb/wlan/if_rumvar.h',
+            'sys/dev/usb/wlan/if_runreg.h',
+            'sys/dev/usb/wlan/if_runvar.h',
             'sys/dev/usb/wlan/if_uathreg.h',
             'sys/dev/usb/wlan/if_uathvar.h',
             'sys/dev/usb/wlan/if_upgtvar.h',
             'sys/dev/usb/wlan/if_uralreg.h',
             'sys/dev/usb/wlan/if_uralvar.h',
+            'sys/dev/usb/wlan/if_urtwreg.h',
+            'sys/dev/usb/wlan/if_urtwvar.h',
             'sys/dev/usb/wlan/if_zydfw.h',
             'sys/dev/usb/wlan/if_zydreg.h',
         ]
     )
     mod.addKernelSpaceSourceFiles(
         [
+            'sys/dev/usb/wlan/if_rsu.c',
             'sys/dev/usb/wlan/if_rum.c',
+            'sys/dev/usb/wlan/if_run.c',
             'sys/dev/usb/wlan/if_uath.c',
             'sys/dev/usb/wlan/if_upgt.c',
             'sys/dev/usb/wlan/if_ural.c',
+            'sys/dev/usb/wlan/if_urtw.c',
             'sys/dev/usb/wlan/if_zyd.c',
         ],
         mm.generator['source']()
@@ -2760,8 +2791,8 @@ def sources(mm):
     #mm.addModule(dev_usb_input(mm))
     #mm.addModule(dev_usb_mouse(mm))
     #mm.addModule(dev_usb_serial(mm))
-    #mm.addModule(dev_usb_net(mm))
-    #mm.addModule(dev_usb_wlan(mm))
+    mm.addModule(dev_usb_net(mm))
+    mm.addModule(dev_usb_wlan(mm))
 
     mm.addModule(cam(mm))
     mm.addModule(dev_usb_storage(mm))
diff --git a/libbsd_waf.py b/libbsd_waf.py
index d724de9..6b49271 100644
--- a/libbsd_waf.py
+++ b/libbsd_waf.py
@@ -773,6 +773,20 @@ def build(bld):
               'freebsd/sys/dev/usb/controller/ehci.c',
               'freebsd/sys/dev/usb/controller/ohci.c',
               'freebsd/sys/dev/usb/controller/usb_controller.c',
+              'freebsd/sys/dev/usb/net/if_aue.c',
+              'freebsd/sys/dev/usb/net/if_axe.c',
+              'freebsd/sys/dev/usb/net/if_axge.c',
+              'freebsd/sys/dev/usb/net/if_cdce.c',
+              'freebsd/sys/dev/usb/net/if_cue.c',
+              'freebsd/sys/dev/usb/net/if_ipheth.c',
+              'freebsd/sys/dev/usb/net/if_kue.c',
+              'freebsd/sys/dev/usb/net/if_mos.c',
+              'freebsd/sys/dev/usb/net/if_rue.c',
+              'freebsd/sys/dev/usb/net/if_smsc.c',
+              'freebsd/sys/dev/usb/net/if_udav.c',
+              'freebsd/sys/dev/usb/net/if_ure.c',
+              '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/storage/umass.c',
               'freebsd/sys/dev/usb/usb_busdma.c',
@@ -794,6 +808,14 @@ def build(bld):
               'freebsd/sys/dev/usb/usb_request.c',
               'freebsd/sys/dev/usb/usb_transfer.c',
               'freebsd/sys/dev/usb/usb_util.c',
+              'freebsd/sys/dev/usb/wlan/if_rsu.c',
+              'freebsd/sys/dev/usb/wlan/if_rum.c',
+              'freebsd/sys/dev/usb/wlan/if_run.c',
+              'freebsd/sys/dev/usb/wlan/if_uath.c',
+              'freebsd/sys/dev/usb/wlan/if_upgt.c',
+              'freebsd/sys/dev/usb/wlan/if_ural.c',
+              'freebsd/sys/dev/usb/wlan/if_urtw.c',
+              'freebsd/sys/dev/usb/wlan/if_zyd.c',
               'freebsd/sys/kern/init_main.c',
               'freebsd/sys/kern/kern_condvar.c',
               'freebsd/sys/kern/kern_conf.c',
diff --git a/rtemsbsd/include/rtems/bsd/local/opt_urtwn.h b/rtemsbsd/include/rtems/bsd/local/opt_urtwn.h
new file mode 100644
index 0000000..e69de29



More information about the vc mailing list