lib80211/regdomain: Port to RTEMS.

Makefile.todo

@@ -27,6 +27,8 @@ GENERATED += $(LOCAL_SRC)/mmcbr_if.c
 GENERATED += $(LOCAL_INC)/mmcbus_if.h
 GENERATED += $(LOCAL_SRC)/mmcbus_if.c
 GENERATED += $(LOCAL_SRC)/urtwn-rtl8192cfwT.fw.c
+GENERATED += rtemsbsd/include/machine/rtems-bsd-regdomain.h
+GENERATED += rtemsbsd/rtems/rtems-bsd-regdomain.c
 
 all: $(GENERATED)
 
@@ -148,5 +150,11 @@ freebsd/usr.bin/netstat/nl_defs.h: $(FREEBSD_SRC)/usr.bin/netstat/nlist_symbols
 	    !/^\#/ { printf("\#define\tN%s\t%s\n", toupper($$2), i++); }' \
 	    < $< > $@ || rm -f $@
 
+rtemsbsd/include/machine/rtems-bsd-regdomain.h: $(FREEBSD_SRC)/etc/regdomain.xml
+	rtems-bin2c -H $< $@
+
+rtemsbsd/rtems/rtems-bsd-regdomain.c: $(FREEBSD_SRC)/etc/regdomain.xml
+	rtems-bin2c -C $< $@
+
 clean:
 	rm $(GENERATED)

freebsd/lib/lib80211/lib80211_regdomain.c

@@ -28,6 +28,15 @@
 static const char rcsid[] = "$FreeBSD$";
 #endif /* not lint */
 
+#ifdef __rtems__
+/* We need some functions from kernel name space */
+#define sbuf_bcat	_bsd_sbuf_bcat
+#define sbuf_finish	_bsd_sbuf_finish
+#define sbuf_data	_bsd_sbuf_data
+#define sbuf_len	_bsd_sbuf_len
+#define sbuf_delete	_bsd_sbuf_delete
+#define sbuf_new	_bsd_sbuf_new
+#endif /* __rtems__ */
 #include <sys/types.h>
 #include <rtems/bsd/sys/errno.h>
 #include <rtems/bsd/sys/param.h>
@@ -47,6 +56,9 @@ static const char rcsid[] = "$FreeBSD$";
 #include "lib80211_regdomain.h"
 
 #include <net80211/_ieee80211.h>
+#ifdef __rtems__
+#include <machine/rtems-bsd-regdomain.h>
+#endif /* __rtems__ */
 
 #define	MAXLEVEL	20
 
@@ -627,6 +639,7 @@ lib80211_alloc_regdata(void)
 
 	rdp = calloc(1, sizeof(struct regdata));
 
+#ifndef __rtems__
 	fd = open(_PATH_REGDOMAIN, O_RDONLY);
 	if (fd < 0) {
 #ifdef DEBUG
@@ -652,6 +665,10 @@ lib80211_alloc_regdata(void)
 		free(rdp);
 		return NULL;
 	}
+#else /* __rtems__ */
+	sb.st_size = regdomain_xml_size;
+	xml = regdomain_xml;
+#endif /* __rtems__ */
 	if (lib80211_regdomain_readconfig(rdp, xml, sb.st_size) != 0) {
 #ifdef DEBUG
 		warn("%s: error reading regulatory database", __func__);
@@ -661,8 +678,10 @@ lib80211_alloc_regdata(void)
 		free(rdp);
 		return NULL;
 	}
+#ifndef __rtems__
 	munmap(xml, sb.st_size);
 	close(fd);
+#endif /* __rtems__ */
 
 	return rdp;
 }

libbsd.py

@@ -2037,6 +2037,17 @@ def user_space(mm):
         ],
         mm.generator['source']('-D__DBINTERFACE_PRIVATE -DINET6')
     )
+    mod.addRTEMSHeaderFiles(
+        [
+            'include/machine/rtems-bsd-regdomain.h',
+        ]
+    )
+    mod.addRTEMSSourceFiles(
+        [
+            'rtems/rtems-bsd-regdomain.c',
+        ],
+        mm.generator['source']()
+    )
     mod.addUserSpaceSourceFiles(
         [
             'bin/hostname/hostname.c',

libbsd_waf.py

@@ -1180,6 +1180,7 @@ def build(bld):
               'rtemsbsd/rtems/rtems-bsd-rc-conf-net.c',
               'rtemsbsd/rtems/rtems-bsd-rc-conf-pf.c',
               'rtemsbsd/rtems/rtems-bsd-rc-conf.c',
+              'rtemsbsd/rtems/rtems-bsd-regdomain.c',
               'rtemsbsd/rtems/rtems-bsd-shell-arp.c',
               'rtemsbsd/rtems/rtems-bsd-shell-dhcpcd.c',
               'rtemsbsd/rtems/rtems-bsd-shell-ifconfig.c',

rtemsbsd/include/machine/rtems-bsd-regdomain.h

@@ -0,0 +1,15 @@
+/*
+ *  Extern declarations for C structure representing binary file regdomain.xml
+ *
+ *  WARNING: Automatically generated -- do not edit!
+ */
+
+#ifndef __rtemsbsd_include_machine_rtems_bsd_regdomain_h
+#define __rtemsbsd_include_machine_rtems_bsd_regdomain_h
+
+#include <sys/types.h>
+
+extern const unsigned char regdomain_xml[];
+extern const size_t regdomain_xml_size;
+
+#endif