From: Arkadiusz Miśkiewicz Date: Fri, 29 Sep 2006 20:24:45 +0000 (+0000) Subject: - updated patches for 2.6 X-Git-Tag: auto/th/ax25-tools-0_0_8-6~1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fax25-tools.git;a=commitdiff_plain;h=9afe612534d28e49cdc7dcb3ef3f9bf833ee96c4 - updated patches for 2.6 Changed files: ax25-tools-build.patch -> 1.1 ax25-tools-linux26.patch -> 1.2 ax25-tools-soundmodem.patch -> 1.1 --- diff --git a/ax25-tools-build.patch b/ax25-tools-build.patch new file mode 100644 index 0000000..5653cb9 --- /dev/null +++ b/ax25-tools-build.patch @@ -0,0 +1,21 @@ +diff -urN ax25-tools-0.0.8.org/hdlcutil/fl/Makefile.am ax25-tools-0.0.8/hdlcutil/fl/Makefile.am +--- ax25-tools-0.0.8.org/hdlcutil/fl/Makefile.am 2001-04-10 04:10:55.000000000 +0200 ++++ ax25-tools-0.0.8/hdlcutil/fl/Makefile.am 2006-09-29 22:24:11.565814000 +0200 +@@ -5,11 +5,11 @@ + + INCLUDES = $(X_CFLAGS) -I.. + LDFLAGS = $(X_LIBS) -lX11 $(FLTK_LIB) +-LDADD = hdrvcomm.o + +-xfsmmixer_SOURCES = xfsmmixer.cxx xfsmmixer_main.cxx xfsmmixer.h +-xfhdlcchpar_SOURCES = xfhdlcchpar.cxx xfhdlcchpar_main.cxx xfhdlcchpar.h +-xfhdlcst_SOURCES = xfhdlcst.cxx xfhdlcst_main.cxx xfhdlcst.h +-xfsmdiag_SOURCES = xfsmdiag.cxx xfsmdiag_main.cxx xfsmdiag.h xfsmdiag_main.h ++xfsmmixer_SOURCES = xfsmmixer.cxx xfsmmixer_main.cxx xfsmmixer.h hdrvcomm.c ++xfhdlcchpar_SOURCES = xfhdlcchpar.cxx xfhdlcchpar_main.cxx xfhdlcchpar.h hdrvcomm.c ++xfhdlcst_SOURCES = xfhdlcst.cxx xfhdlcst_main.cxx xfhdlcst.h hdrvcomm.c ++xfsmdiag_SOURCES = xfsmdiag.cxx xfsmdiag_main.cxx xfsmdiag.h xfsmdiag_main.h hdrvcomm.c + +-hdrvcomm.o: ../hdrvcomm.o ++hdrvcomm.c: ++ ln -s $(top_srcdir)/hdlcutil/hdrvcomm.c $(top_builddir)/hdlcutil/fl/hdrvcomm.c diff --git a/ax25-tools-linux26.patch b/ax25-tools-linux26.patch deleted file mode 100644 index 8a32317..0000000 --- a/ax25-tools-linux26.patch +++ /dev/null @@ -1,199 +0,0 @@ ---- ax25-tools-0.0.8/hdlcutil/sethdlc.c.orig 2001-04-10 04:10:50.000000000 +0200 -+++ ax25-tools-0.0.8/hdlcutil/sethdlc.c 2004-04-10 16:10:41.437874346 +0200 -@@ -478,8 +478,6 @@ - char getsetparams = 0; - char cal = 0; - int cal_val = 0; -- struct sm_ioctl bsi; -- struct baycom_ioctl bbi; - struct hdrvc_channel_state chst; - unsigned char pktbuf[2048]; - -@@ -547,21 +545,6 @@ - chst.dcd ? 'D' : '-', chst.ptt ? 'P' : '-', - chst.rx_packets, chst.tx_packets, chst.rx_errors, - chst.tx_errors); --#ifdef HDRVC_KERNEL -- if (hdrvc_sm_ioctl(SMCTL_GETDEBUG, &bsi) >= 0) { -- printf(" intrate: %u modcyc: %u " -- "demodcyc: %u dmares: %u", -- bsi.data.dbg.int_rate, -- bsi.data.dbg.mod_cycles, -- bsi.data.dbg.demod_cycles, -- bsi.data.dbg.dma_residue); -- } -- if (hdrvc_baycom_ioctl(BAYCOMCTL_GETDEBUG, &bbi) >= 0) { -- printf(" dbg1: %lu dbg2: %lu dbg3: %li", -- bbi.data.dbg.debug1, bbi.data.dbg.debug2, -- bbi.data.dbg.debug3); -- } --#endif /* HDRVC_KERNEL */ - printf("\n"); - break; - case 2: ---- ax25-tools-0.0.8/hdlcutil/hdrvcomm.h.orig 2001-04-10 04:10:48.000000000 +0200 -+++ ax25-tools-0.0.8/hdlcutil/hdrvcomm.h 2004-04-10 16:09:53.581322837 +0200 -@@ -42,8 +42,6 @@ - - #ifdef HDRVC_KERNEL - #include --#include --#include - #endif /* HDRVC_KERNEL */ - - /* ---------------------------------------------------------------------- */ -@@ -104,9 +102,6 @@ - - #ifdef HDRVC_KERNEL - extern int hdrvc_hdlcdrv_ioctl(int cmd, struct hdlcdrv_ioctl *par); --extern int hdrvc_sm_ioctl(int cmd, struct sm_ioctl *par); --extern int hdrvc_baycom_ioctl(int cmd, struct baycom_ioctl *par); --extern int hdrvc_diag(struct sm_diag_data *diag); - #endif /* HDRVC_KERNEL */ - - /* ---------------------------------------------------------------------- */ ---- ax25-tools-0.0.8/hdlcutil/hdrvcomm.c.orig 2001-04-10 04:10:48.000000000 +0200 -+++ ax25-tools-0.0.8/hdlcutil/hdrvcomm.c 2004-04-10 16:12:47.636682893 +0200 -@@ -48,6 +48,7 @@ - #include "hdrvcomm.h" - #include "usersmdiag.h" - #include -+#include - #include - #include - #ifndef SOL_PACKET -@@ -311,36 +312,6 @@ - - /* ---------------------------------------------------------------------- */ - --int hdrvc_sm_ioctl(int cmd, struct sm_ioctl *par) --{ -- struct ifreq ifr = ifr_h; -- -- if (!kernel_mode) { -- errno = EINVAL; -- return -1; -- } -- ifr.ifr_data = (caddr_t)par; -- par->cmd = cmd; -- return ioctl(fd, SIOCDEVPRIVATE, &ifr); --} -- --/* ---------------------------------------------------------------------- */ -- --int hdrvc_baycom_ioctl(int cmd, struct baycom_ioctl *par) --{ -- struct ifreq ifr = ifr_h; -- -- if (!kernel_mode) { -- errno = EINVAL; -- return -1; -- } -- ifr.ifr_data = (caddr_t)par; -- par->cmd = cmd; -- return ioctl(fd, SIOCDEVPRIVATE, &ifr); --} -- --/* ---------------------------------------------------------------------- */ -- - unsigned int hdrvc_get_ifflags(void) - { - struct ifreq ifr; -@@ -356,46 +327,6 @@ - return IFF_UP | IFF_RUNNING; - } - --/* ---------------------------------------------------------------------- */ -- --int hdrvc_diag(struct sm_diag_data *diag) --{ -- struct sm_ioctl smi; -- int ret; -- struct usersmmsg msg; -- -- if (!diag) { -- errno = EINVAL; -- return -1; -- } -- if (kernel_mode) { -- memcpy(&smi.data.diag, diag, sizeof(smi.data.diag)); -- ret = hdrvc_sm_ioctl(SMCTL_DIAGNOSE, &smi); -- memcpy(diag, &smi.data.diag, sizeof(smi.data.diag)); -- return ret; -- } -- msg.hdr.type = USERSM_CMD_REQ_DIAG; -- msg.hdr.channel = 0; -- msg.data.diag.mode = diag->mode; -- msg.data.diag.flags = diag->flags; -- msg.data.diag.samplesperbit = diag->samplesperbit; -- msg.data.diag.datalen = diag->datalen; -- hdrvc_sendmsg(&msg, sizeof(msg.data.diag)); -- ret = hdrvc_recvmsg(&msg, sizeof(msg), USERSM_CMD_ACK_DIAG); -- if (ret < 0) -- return ret; -- if (ret < sizeof(msg.data.diag) || ret < sizeof(msg.data.diag)+msg.data.diag.datalen*sizeof(short)) { -- errno = EIO; -- return -1; -- } -- diag->mode = msg.data.diag.mode; -- diag->flags = msg.data.diag.flags; -- diag->samplesperbit = msg.data.diag.samplesperbit; -- diag->datalen = msg.data.diag.datalen; -- memcpy(diag->data, msg.data.diag_out.samples, msg.data.diag.datalen*sizeof(short)); -- return 0; --} -- - #endif /* HDRVC_KERNEL */ - - /* ---------------------------------------------------------------------- */ -@@ -593,27 +524,6 @@ - errno = EINVAL; - return -1; - } --#ifdef HDRVC_KERNEL -- if (kernel_mode) { -- struct sm_ioctl smi; -- static unsigned int modeconvsm[4] = { -- SM_DIAGMODE_OFF, SM_DIAGMODE_INPUT, SM_DIAGMODE_DEMOD, SM_DIAGMODE_CONSTELLATION -- }; -- -- smi.data.diag.mode = modeconvsm[mode]; -- smi.data.diag.flags = (flags & HDRVC_DIAGFLAG_DCDGATE) ? SM_DIAGFLAG_DCDGATE : 0; -- smi.data.diag.samplesperbit = 0; -- smi.data.diag.datalen = maxdatalen; -- smi.data.diag.data = data; -- if ((ret = hdrvc_sm_ioctl(SMCTL_DIAGNOSE, &smi)) < 0) -- return ret; -- if (samplesperbit) -- *samplesperbit = smi.data.diag.samplesperbit; -- if (smi.data.diag.mode != modeconvsm[mode] || !(smi.data.diag.flags & SM_DIAGFLAG_VALID)) -- return 0; -- return smi.data.diag.datalen; -- } --#endif /* HDRVC_KERNEL */ - msg.hdr.type = USERSM_CMD_REQ_DIAG; - msg.hdr.channel = 0; - msg.data.diag.mode = modeconvusersm[mode]; ---- ax25-tools-0.0.8/hdlcutil/Makefile.am.orig 2001-04-10 04:10:44.000000000 +0200 -+++ ax25-tools-0.0.8/hdlcutil/Makefile.am 2004-04-10 16:23:49.641133913 +0200 -@@ -5,10 +5,9 @@ - - SUBDIRS = fl - --bin_PROGRAMS = sethdlc smmixer $(X11_bin_programs) -+bin_PROGRAMS = sethdlc $(X11_bin_programs) - - sethdlc_SOURCES = sethdlc.c hdrvcomm.c hdrvcomm.h usersmdiag.h --smmixer_SOURCES = smmixer.c hdrvcomm.c hdrvcomm.h usersmdiag.h - smdiag_SOURCES = smdiag.c hdrvcomm.c hdrvcomm.h usersmdiag.h - - smdiag_LDADD = $(X_LIBS) -lX11 $(X_EXTRA_LIBS) -@@ -19,7 +18,7 @@ - AX25_SYSCONFDIR=$(sysconfdir)/ax25/ - AX25_LOCALSTATEDIR=$(localstatedir)/ax25/ - --man_MANS = sethdlc.8 smmixer.8 baycom.9 hdlcdrv.9 soundmodem.9 smdiag.8 -+man_MANS = sethdlc.8 baycom.9 hdlcdrv.9 soundmodem.9 smdiag.8 - - EXTRA_DIST = $(man_MANS) - diff --git a/ax25-tools-soundmodem.patch b/ax25-tools-soundmodem.patch new file mode 100644 index 0000000..8b28d28 --- /dev/null +++ b/ax25-tools-soundmodem.patch @@ -0,0 +1,118 @@ +Submitted By: Jeremy Utley +Date: 2004-09-25 +Initial package Version: 0.0.8 +Upstream Status: Not Submitted (Hack) +Origin: Ported from Debian ax25-utils-0.0.8-5 Diff +Description: This unmaintained package has a problem compiling on a system +based from the linux-libc-headers, since the soundmodem driver and it's +associated header file has been removed from kernel 2.6. This patch places the +soundmodem.h header file into the source package itself, allowing proper +compilation. This is a hack solution, the better solution would be to remove +any references to the header from the source. + +diff -Naur ax25-tools-0.0.8/hdlcutil/hdrvcomm.h ax25-tools-0.0.8-new/hdlcutil/hdrvcomm.h +--- ax25-tools-0.0.8/hdlcutil/hdrvcomm.h 2001-04-10 02:10:48.000000000 +0000 ++++ ax25-tools-0.0.8-new/hdlcutil/hdrvcomm.h 2004-09-26 04:46:53.390747547 +0000 +@@ -42,7 +42,7 @@ + + #ifdef HDRVC_KERNEL + #include +-#include ++#include "soundmodem.h" + #include + #endif /* HDRVC_KERNEL */ + +diff -Naur ax25-tools-0.0.8/hdlcutil/soundmodem.h ax25-tools-0.0.8-new/hdlcutil/soundmodem.h +--- ax25-tools-0.0.8/hdlcutil/soundmodem.h 1970-01-01 00:00:00.000000000 +0000 ++++ ax25-tools-0.0.8-new/hdlcutil/soundmodem.h 2004-09-26 04:46:53.392747063 +0000 +@@ -0,0 +1,90 @@ ++/* ++ * The Linux soundcard driver for 1200 baud and 9600 baud packet radio ++ * (C) 1996-1998 by Thomas Sailer, HB9JNX/AE4WA ++ */ ++ ++#ifndef _SOUNDMODEM_H ++#define _SOUNDMODEM_H ++ ++/* -------------------------------------------------------------------- */ ++/* ++ * structs for the IOCTL commands ++ */ ++ ++struct sm_debug_data { ++ unsigned int int_rate; ++ unsigned int mod_cycles; ++ unsigned int demod_cycles; ++ unsigned int dma_residue; ++}; ++ ++struct sm_diag_data { ++ unsigned int mode; ++ unsigned int flags; ++ unsigned int samplesperbit; ++ unsigned int datalen; ++ short *data; ++}; ++ ++struct sm_mixer_data { ++ unsigned int mixer_type; ++ unsigned int sample_rate; ++ unsigned int bit_rate; ++ unsigned int reg; ++ unsigned int data; ++}; ++ ++struct sm_config { ++ int hardware; ++ int mode; ++}; ++ ++struct sm_ioctl { ++ int cmd; ++ union { ++ struct sm_config cfg; ++ struct sm_diag_data diag; ++ struct sm_mixer_data mix; ++ struct sm_debug_data dbg; ++ } data; ++}; ++ ++/* -------------------------------------------------------------------- */ ++ ++/* ++ * diagnose modes ++ */ ++#define SM_DIAGMODE_OFF 0 ++#define SM_DIAGMODE_INPUT 1 ++#define SM_DIAGMODE_DEMOD 2 ++#define SM_DIAGMODE_CONSTELLATION 3 ++ ++/* ++ * diagnose flags ++ */ ++#define SM_DIAGFLAG_DCDGATE (1<<0) ++#define SM_DIAGFLAG_VALID (1<<1) ++ ++/* ++ * mixer types ++ */ ++#define SM_MIXER_INVALID 0 ++#define SM_MIXER_AD1848 0x10 ++#define SM_MIXER_CRYSTAL 0x11 ++#define SM_MIXER_CT1335 0x20 ++#define SM_MIXER_CT1345 0x21 ++#define SM_MIXER_CT1745 0x22 ++ ++/* ++ * ioctl values ++ */ ++#define SMCTL_DIAGNOSE 0x82 ++#define SMCTL_GETMIXER 0x83 ++#define SMCTL_SETMIXER 0x84 ++#define SMCTL_GETDEBUG 0x85 ++ ++/* -------------------------------------------------------------------- */ ++ ++#endif /* _SOUNDMODEM_H */ ++ ++/* --------------------------------------------------------------------- */