aboutsummaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
authorDiane Bruce <db@FreeBSD.org>2011-08-06 01:57:09 +0000
committerDiane Bruce <db@FreeBSD.org>2011-08-06 01:57:09 +0000
commitbecc5c15ae97b357c4d0fec3bb902346826a3eb0 (patch)
tree92d838f6a9cf887f01d6af8eb34d8fd4a17178ef /comms
parent0d15ccba071120e95b136ef24a476fa2e1c5921b (diff)
downloadports-becc5c15ae97b357c4d0fec3bb902346826a3eb0.tar.gz
ports-becc5c15ae97b357c4d0fec3bb902346826a3eb0.zip
- Fixed build under clang, no other changes.
Notes
Notes: svn path=/head/; revision=278987
Diffstat (limited to 'comms')
-rw-r--r--comms/hf/files/patch-dcf77_dcfdemod.c20
-rw-r--r--comms/hf/files/patch-dcf77_dcfdemodpn.c20
-rw-r--r--comms/hf/files/patch-dcf77_hbgdemod.c11
-rw-r--r--comms/hf/files/patch-hfkernel_fsk_fskinlines.h29
-rw-r--r--comms/hf/files/patch-hfkernel_fsk_fskl1.c11
-rw-r--r--comms/hf/files/patch-hfkernel_fsk_gtor.c11
-rw-r--r--comms/hf/files/patch-hfkernel_fsk_pactor.c91
-rw-r--r--comms/hf/files/patch-util_channel.c11
-rw-r--r--comms/hf/files/patch-util_testgaussgen.c11
9 files changed, 215 insertions, 0 deletions
diff --git a/comms/hf/files/patch-dcf77_dcfdemod.c b/comms/hf/files/patch-dcf77_dcfdemod.c
new file mode 100644
index 000000000000..f06d5d966345
--- /dev/null
+++ b/comms/hf/files/patch-dcf77_dcfdemod.c
@@ -0,0 +1,20 @@
+--- dcf77/dcfdemod.c.orig 2011-08-05 11:39:38.000000000 -0400
++++ dcf77/dcfdemod.c 2011-08-05 12:02:16.000000000 -0400
+@@ -91,7 +91,7 @@
+
+ /* --------------------------------------------------------------------- */
+
+-extern __inline__ void decode_ampl_bit(unsigned int bit, unsigned int samples)
++__inline__ void decode_ampl_bit(unsigned int bit, unsigned int samples)
+ {
+ if (bit == 0) {
+ if (d.t.dcnt >= 59)
+@@ -109,7 +109,7 @@
+
+ /* --------------------------------------------------------------------- */
+
+-extern __inline__ void dcf77_process_ampl(int si, unsigned int samples)
++__inline__ void dcf77_process_ampl(int si, unsigned int samples)
+ {
+ static int rodcnt = 0;
+ char* rod = "|/-\\ ";
diff --git a/comms/hf/files/patch-dcf77_dcfdemodpn.c b/comms/hf/files/patch-dcf77_dcfdemodpn.c
new file mode 100644
index 000000000000..7279ebf85d41
--- /dev/null
+++ b/comms/hf/files/patch-dcf77_dcfdemodpn.c
@@ -0,0 +1,20 @@
+--- dcf77/dcfdemodpn.c.orig 2011-08-05 12:03:43.000000000 -0400
++++ dcf77/dcfdemodpn.c 2011-08-05 12:13:40.000000000 -0400
+@@ -132,7 +132,7 @@
+ #define PN_TRKTAU (PN_SEQINC/3)
+ #define PN_TRKADJ (PN_SEQINC/8)
+
+-extern __inline__ void trk_sample(int sq, unsigned int samples)
++__inline__ void trk_sample(int sq, unsigned int samples)
+ {
+ if (d.d.sec_ph > 0x3fffffff) {
+ trk_init();
+@@ -201,7 +201,7 @@
+
+ /* --------------------------------------------------------------------- */
+
+-extern __inline__ void srch_sample(int sq)
++__inline__ void srch_sample(int sq)
+ {
+ unsigned int u, k;
+ int asq = abs(sq);
diff --git a/comms/hf/files/patch-dcf77_hbgdemod.c b/comms/hf/files/patch-dcf77_hbgdemod.c
new file mode 100644
index 000000000000..d6847580452c
--- /dev/null
+++ b/comms/hf/files/patch-dcf77_hbgdemod.c
@@ -0,0 +1,11 @@
+--- dcf77/hbgdemod.c.orig 2011-08-05 12:15:27.000000000 -0400
++++ dcf77/hbgdemod.c 2011-08-05 12:15:37.000000000 -0400
+@@ -109,7 +109,7 @@
+
+ /* --------------------------------------------------------------------- */
+
+-extern __inline__ void hbg_process_ampl(int si, unsigned int samples)
++__inline__ void hbg_process_ampl(int si, unsigned int samples)
+ {
+ static int rodcnt = 0;
+ char* rod = "|/-\\ ";
diff --git a/comms/hf/files/patch-hfkernel_fsk_fskinlines.h b/comms/hf/files/patch-hfkernel_fsk_fskinlines.h
new file mode 100644
index 000000000000..27ced4d34c46
--- /dev/null
+++ b/comms/hf/files/patch-hfkernel_fsk_fskinlines.h
@@ -0,0 +1,29 @@
+--- hfkernel/fsk/fskinlines.h.orig 2011-08-05 10:56:43.000000000 -0400
++++ hfkernel/fsk/fskinlines.h 2011-08-05 11:00:59.000000000 -0400
+@@ -84,7 +84,7 @@
+
+ /* --------------------------------------------------------------------- */
+
+-extern __inline__ unsigned int cc_replace(void)
++__inline__ unsigned int cc_replace(void)
+ {
+ unsigned int j, k = CORRELATOR_CACHE;
+ int l = -1;
+@@ -175,7 +175,7 @@
+
+ /* --------------------------------------------------------------------- */
+
+-extern __inline__ l1_soft_t do_filter(struct l1rxslots *slot, short *s)
++__inline__ l1_soft_t do_filter(struct l1rxslots *slot, short *s)
+ {
+ unsigned int cc = slot->corr_cache;
+
+@@ -319,7 +319,7 @@
+
+ /* --------------------------------------------------------------------- */
+
+-extern __inline__ l1_soft_t do_filter(struct l1rxslots *slot, short *s)
++ __inline__ l1_soft_t do_filter(struct l1rxslots *slot, short *s)
+ {
+
+ unsigned int cc = slot->corr_cache;
diff --git a/comms/hf/files/patch-hfkernel_fsk_fskl1.c b/comms/hf/files/patch-hfkernel_fsk_fskl1.c
new file mode 100644
index 000000000000..48e4edbc6b9b
--- /dev/null
+++ b/comms/hf/files/patch-hfkernel_fsk_fskl1.c
@@ -0,0 +1,11 @@
+--- hfkernel/fsk/fskl1.c.orig 2011-08-05 10:57:44.000000000 -0400
++++ hfkernel/fsk/fskl1.c 2011-08-05 10:58:19.000000000 -0400
+@@ -376,7 +376,7 @@
+
+ /* --------------------------------------------------------------------- */
+
+-extern __inline__ unsigned int output_one_sample(l1_time_t tm)
++__inline__ unsigned int output_one_sample(l1_time_t tm)
+ {
+ int i, j, k;
+
diff --git a/comms/hf/files/patch-hfkernel_fsk_gtor.c b/comms/hf/files/patch-hfkernel_fsk_gtor.c
new file mode 100644
index 000000000000..80faee1f420e
--- /dev/null
+++ b/comms/hf/files/patch-hfkernel_fsk_gtor.c
@@ -0,0 +1,11 @@
+--- hfkernel/fsk/gtor.c.orig 2011-08-05 09:19:37.000000000 -0400
++++ hfkernel/fsk/gtor.c 2011-08-05 10:51:40.000000000 -0400
+@@ -780,7 +780,7 @@
+
+ /* --------------------------------------------------------------------- */
+
+-extern __inline__ void soft_deinterleave(const int *inp, unsigned short *out,
++__inline__ void soft_deinterleave(const int *inp, unsigned short *out,
+ unsigned int ntrib, unsigned int spacing, int inv)
+ {
+ unsigned int invm = inv ? 0 : ~0;
diff --git a/comms/hf/files/patch-hfkernel_fsk_pactor.c b/comms/hf/files/patch-hfkernel_fsk_pactor.c
new file mode 100644
index 000000000000..2f7c123cabef
--- /dev/null
+++ b/comms/hf/files/patch-hfkernel_fsk_pactor.c
@@ -0,0 +1,91 @@
+--- hfkernel/fsk/pactor.c.orig 2011-08-05 09:15:15.000000000 -0400
++++ hfkernel/fsk/pactor.c 2011-08-05 09:15:55.000000000 -0400
+@@ -256,7 +256,7 @@
+
+ /* --------------------------------------------------------------------- */
+
+-extern __inline__ unsigned int get_crc_preset(int pktlen)
++__inline__ unsigned int get_crc_preset(int pktlen)
+ {
+ switch (pktlen) {
+ case 23:
+@@ -280,7 +280,7 @@
+ #define PKT_QRT (1<<2)
+ #define PKT_IDLE (1<<3)
+
+-extern __inline__ void decode_qrt_packet(unsigned char *data, int pktlen)
++__inline__ void decode_qrt_packet(unsigned char *data, int pktlen)
+ {
+ unsigned char buf[8];
+ unsigned char *bp2;
+@@ -456,7 +456,7 @@
+ };
+
+
+-extern __inline__ void encode_qrt_packet(int pktlen)
++__inline__ void encode_qrt_packet(int pktlen)
+ {
+ unsigned char *p1, *p2;
+ unsigned int crc;
+@@ -611,7 +611,7 @@
+
+ #define TMSIZE (sizeof(ps.tm.devflt)/sizeof(ps.tm.devflt[0]))
+
+-extern __inline__ void tmg_clear(void)
++__inline__ void tmg_clear(void)
+ {
+ memset(ps.tm.devflt, 0, sizeof(ps.tm.devflt));
+ ps.tm.ptr = 0;
+@@ -646,7 +646,7 @@
+
+ /* --------------------------------------------------------------------- */
+
+-extern __inline__ void marq_clear(void)
++__inline__ void marq_clear(void)
+ {
+ memset(ps.marq.acc, 0, sizeof(ps.marq.acc));
+ ps.marq.hdr = 0xff;
+@@ -657,7 +657,7 @@
+ * misc utility functions
+ */
+
+-extern __inline__ void cycle_end(void)
++__inline__ void cycle_end(void)
+ {
+ ps.rxtime += PACTOR_CYCLE_ARQ;
+ ps.txtime += PACTOR_CYCLE_ARQ;
+@@ -665,14 +665,14 @@
+ ps.txinv = !ps.txinv;
+ }
+
+-extern __inline__ void ack_transmit(void)
++__inline__ void ack_transmit(void)
+ {
+ kbd_ack();
+ ps.pkt_counter = (ps.pkt_counter + 1) & 3;
+ ps.cur_hdr ^= 0xff;
+ }
+
+-extern __inline__ int retry(void)
++__inline__ int retry(void)
+ {
+ if ((--ps.retry) <= 0)
+ return 1;
+@@ -680,7 +680,7 @@
+ }
+
+ #ifdef FREQ_TRACKING
+-extern __inline__ void pct_freq_tracking(int trk, l1_soft_t trkl, l1_soft_t trkm, l1_soft_t trkh)
++__inline__ void pct_freq_tracking(int trk, l1_soft_t trkl, l1_soft_t trkm, l1_soft_t trkh)
+ {
+ ps.rxfreqdev += trk;
+ if (!ps.is_master)
+@@ -1534,7 +1534,7 @@
+
+ /* --------------------------------------------------------------------- */
+
+-extern __inline__ void guess_crc(unsigned char *pkt, unsigned int len)
++__inline__ void guess_crc(unsigned char *pkt, unsigned int len)
+ {
+ #ifdef STANDBY_CRC_PRINT
+ unsigned char buf[24];
diff --git a/comms/hf/files/patch-util_channel.c b/comms/hf/files/patch-util_channel.c
new file mode 100644
index 000000000000..3075d14079a3
--- /dev/null
+++ b/comms/hf/files/patch-util_channel.c
@@ -0,0 +1,11 @@
+--- util/channel.c.orig 2011-08-05 12:18:02.000000000 -0400
++++ util/channel.c 2011-08-05 12:18:21.000000000 -0400
+@@ -217,7 +217,7 @@
+ * with nrand = 16 and randommax = 0x1000
+ */
+
+-extern __inline__ float randn(void)
++__inline__ float randn(void)
+ {
+ int sum = 0, i;
+
diff --git a/comms/hf/files/patch-util_testgaussgen.c b/comms/hf/files/patch-util_testgaussgen.c
new file mode 100644
index 000000000000..8a0265be89eb
--- /dev/null
+++ b/comms/hf/files/patch-util_testgaussgen.c
@@ -0,0 +1,11 @@
+--- util/testgaussgen.c.orig 2011-08-05 12:28:30.000000000 -0400
++++ util/testgaussgen.c 2011-08-05 12:31:35.000000000 -0400
+@@ -72,7 +72,7 @@
+ * with nrand = 16 and randommax = 0x1000
+ */
+
+-extern __inline__ float randn(void)
++__inline__ float randn(void)
+ {
+ int sum = 0, i;
+