summaryrefslogtreecommitdiff
path: root/comms/hf/files
diff options
context:
space:
mode:
Diffstat (limited to 'comms/hf/files')
-rw-r--r--comms/hf/files/patch-Makefile.in11
-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_Makefile.in19
-rw-r--r--comms/hf/files/patch-hfkernel_cw.c63
-rw-r--r--comms/hf/files/patch-hfkernel_cw_elbug.c21
-rw-r--r--comms/hf/files/patch-hfkernel_elbug.c28
-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-hfkernel_l1_refclock.c12
-rw-r--r--comms/hf/files/patch-scripts_Makefile.in11
-rw-r--r--comms/hf/files/patch-util_channel.c11
-rw-r--r--comms/hf/files/patch-util_testgaussgen.c11
16 files changed, 0 insertions, 380 deletions
diff --git a/comms/hf/files/patch-Makefile.in b/comms/hf/files/patch-Makefile.in
deleted file mode 100644
index 0ee330ab4867..000000000000
--- a/comms/hf/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig Tue Feb 6 09:34:22 2007
-+++ Makefile.in Sun Apr 15 15:41:41 2007
-@@ -156,7 +156,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = scripts hfkernel hfterm dcf77 doc test util
-+SUBDIRS = scripts hfkernel hfterm dcf77 doc/man test util
- EXTRA_DIST = depcomp hf.spec
- all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/comms/hf/files/patch-dcf77_dcfdemod.c b/comms/hf/files/patch-dcf77_dcfdemod.c
deleted file mode 100644
index f06d5d966345..000000000000
--- a/comms/hf/files/patch-dcf77_dcfdemod.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index 7279ebf85d41..000000000000
--- a/comms/hf/files/patch-dcf77_dcfdemodpn.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index d6847580452c..000000000000
--- a/comms/hf/files/patch-dcf77_hbgdemod.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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_Makefile.in b/comms/hf/files/patch-hfkernel_Makefile.in
deleted file mode 100644
index 188fe8df0a12..000000000000
--- a/comms/hf/files/patch-hfkernel_Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- hfkernel/Makefile.in.orig 2007-02-06 09:44:30.000000000 -0500
-+++ hfkernel/Makefile.in 2013-12-14 21:36:25.710721920 -0500
-@@ -114,7 +114,7 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lm
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
- OBJEXT = @OBJEXT@
-@@ -179,6 +179,7 @@
- noinst_HEADERS = main.h msg.h
- hfkernel_SOURCES = main.c msg.c
- hfkernel_DEPENDANCIES = $(noinst_HEADERS) $(hfkernel_SOURCES) $(MYLIBS)
-+THRLIBS= -lpthread
- hfkernel_LDADD = $(MYLIBS) \
- $(OSLIBS) $(SOCKLIBS) $(THRLIBS) $(SCHEDLIBS) $(ALSALIBS) -lstdc++
-
diff --git a/comms/hf/files/patch-hfkernel_cw.c b/comms/hf/files/patch-hfkernel_cw.c
deleted file mode 100644
index 0eefe1c83056..000000000000
--- a/comms/hf/files/patch-hfkernel_cw.c
+++ /dev/null
@@ -1,63 +0,0 @@
---- hfkernel/cw/cw.c.orig 2007-12-24 08:38:46.000000000 -0500
-+++ hfkernel/cw/cw.c 2007-12-24 08:45:35.000000000 -0500
-@@ -39,11 +39,21 @@
- #ifdef __linux__
- #include <sys/io.h>
- #define IOPERM ioperm
-+#define TTY0 "/dev/ttyS0"
-+#define TTY1 "/dev/ttyS1"
-+#define TTY2 "/dev/ttyS2"
-+#define TTY3 "/dev/ttyS3"
- #endif
- #ifdef __FreeBSD__
- #include <machine/cpufunc.h>
- #include <machine/sysarch.h>
--#define IOPERM i386_set_ioperm
-+#define TTY0 "/dev/ttyd0"
-+#define TTY1 "/dev/ttyd1"
-+#define TTY2 "/dev/ttyd2"
-+#define TTY3 "/dev/ttyd3"
-+ #ifdef __i386__
-+ #define IOPERM i386_set_ioperm
-+ #endif
- #endif
- #include <sys/time.h>
- #include <time.h>
-@@ -408,6 +418,7 @@
-
- void *mode_cw_tx(void *dummy)
- {
-+#ifdef IOPERM
- /* duration of 1 dot, i suppose a word has 50 dots */
- /* ---> so i think 1 baud in cw is 50 * wpm / 60 */
- int i = 0, err = 0, pausecount = 0, idlewait, status, cts, dcd;
-@@ -416,16 +427,16 @@
- printf("%s", cable);
-
- if (name_ptt) {
-- if (! strcmp (name_ptt, "/dev/ttyS0")) {
-+ if (! strcmp (name_ptt, TTY0)) {
- port = 0x3F8;
- }
-- if (! strcmp (name_ptt, "/dev/ttyS1")) {
-+ if (! strcmp (name_ptt, TTY1)) {
- port = 0x2F8;
- }
-- if (! strcmp (name_ptt, "/dev/ttyS2")) {
-+ if (! strcmp (name_ptt, TTY2)) {
- port = 0x3E8;
- }
-- if (! strcmp (name_ptt, "/dev/ttyS3")) {
-+ if (! strcmp (name_ptt, TTY3)) {
- port = 0x2E8;
- }
- }
-@@ -514,5 +525,8 @@
- decode(PAUSE);
- }
- }
-+#else
-+ printf("Not on i386, elbug disabled\n");
-+#endif
- }
-
diff --git a/comms/hf/files/patch-hfkernel_cw_elbug.c b/comms/hf/files/patch-hfkernel_cw_elbug.c
deleted file mode 100644
index 7da9e46f6675..000000000000
--- a/comms/hf/files/patch-hfkernel_cw_elbug.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- hfkernel/cw/elbug.c.orig Sun Apr 15 15:53:59 2007
-+++ hfkernel/cw/elbug.c Sun Apr 15 15:56:17 2007
-@@ -36,7 +36,10 @@
- #ifdef __FreeBSD__
- #include <machine/cpufunc.h>
- #include <machine/sysarch.h>
-+#include <sys/kbio.h>
- #define IOPERM i386_set_ioperm
-+#else
-+#include <sys/kd.h> /* Linux, UnixWare */
- #endif
- #include <sys/time.h>
- #include <sys/ioctl.h>
-@@ -44,7 +47,6 @@
- #include <unistd.h>
- #include <string.h>
- #include <stdlib.h>
--#include <sys/kd.h> /* Linux, UnixWare */
- /*
- if kd.h not found, maybe you have to take one of these 2:
- <sys/vtkd.h> for OpenServer
diff --git a/comms/hf/files/patch-hfkernel_elbug.c b/comms/hf/files/patch-hfkernel_elbug.c
deleted file mode 100644
index 2a900540aac3..000000000000
--- a/comms/hf/files/patch-hfkernel_elbug.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- hfkernel/cw/elbug.c.orig 2007-12-24 09:30:07.000000000 -0500
-+++ hfkernel/cw/elbug.c 2007-12-24 09:31:45.000000000 -0500
-@@ -37,7 +37,9 @@
- #include <machine/cpufunc.h>
- #include <machine/sysarch.h>
- #include <sys/kbio.h>
-+#ifdef __i386__
- #define IOPERM i386_set_ioperm
-+#endif
- #else
- #include <sys/kd.h> /* Linux, UnixWare */
- #endif
-@@ -328,10 +330,15 @@
- exit (0);
- }
- }
-+#ifdef IOPERM
- if ((err = IOPERM(port, 8, 1))) {
- printf("permission problem for serial port %04x: ioperm = %d\n", port, err);
- printf("This program has to be called with root permissions.\n");
- }
-+#else
-+ printf("No IOPERM non i386?\n");
-+ exit(-1);
-+#endif
- if ((fd_ptt = open(name_ptt, O_RDWR, 0)) < 0) {
- printf("error in opening ptt device %s - maybe try another one?\n",
- name_ptt);
diff --git a/comms/hf/files/patch-hfkernel_fsk_fskinlines.h b/comms/hf/files/patch-hfkernel_fsk_fskinlines.h
deleted file mode 100644
index 27ced4d34c46..000000000000
--- a/comms/hf/files/patch-hfkernel_fsk_fskinlines.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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
deleted file mode 100644
index 48e4edbc6b9b..000000000000
--- a/comms/hf/files/patch-hfkernel_fsk_fskl1.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 80faee1f420e..000000000000
--- a/comms/hf/files/patch-hfkernel_fsk_gtor.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 2f7c123cabef..000000000000
--- a/comms/hf/files/patch-hfkernel_fsk_pactor.c
+++ /dev/null
@@ -1,91 +0,0 @@
---- 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-hfkernel_l1_refclock.c b/comms/hf/files/patch-hfkernel_l1_refclock.c
deleted file mode 100644
index f14b5b363438..000000000000
--- a/comms/hf/files/patch-hfkernel_l1_refclock.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- hfkernel/l1/refclock.c.orig 2007-12-23 22:40:50.000000000 -0500
-+++ hfkernel/l1/refclock.c 2007-12-23 22:41:42.000000000 -0500
-@@ -225,7 +225,9 @@
- "So I use gettimeofday() as timing source, which has lowest accuracy.\n"
- "Let's hope you entered a good gettimeofday correction with -t %10.9f.\n",
- tv_corr);
-+#ifdef __i386__
- rdtsc_ok=0;
-+#endif
- }
- }
- return (lasttime = curtime);
diff --git a/comms/hf/files/patch-scripts_Makefile.in b/comms/hf/files/patch-scripts_Makefile.in
deleted file mode 100644
index 69c54385d514..000000000000
--- a/comms/hf/files/patch-scripts_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/Makefile.in.orig Mon Apr 16 09:53:29 2007
-+++ scripts/Makefile.in Mon Apr 16 09:55:04 2007
-@@ -288,7 +288,7 @@
-
- install:
- $(mkinstalldirs) $(DESTDIR)$(configdir)
-- $(INSTALL_DATA) $(configfiles) $(DESTDIR)$(configdir)
-+ $(INSTALL_DATA) $(configfiles) $(DESTDIR)$(configdir)/calibrations.samp
- $(mkinstalldirs) $(DESTDIR)$(bindir)
- $(INSTALL) $(scripts) $(DESTDIR)$(bindir)
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/comms/hf/files/patch-util_channel.c b/comms/hf/files/patch-util_channel.c
deleted file mode 100644
index 3075d14079a3..000000000000
--- a/comms/hf/files/patch-util_channel.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 8a0265be89eb..000000000000
--- a/comms/hf/files/patch-util_testgaussgen.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-06 23:46:06 +0000