rpms/ax25-tools/F-8 ax25-tools-0.0.8-soundmodem.h.patch, NONE, 1.1 ax25-tools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Robert 'Bob' Jensen (bjensen) fedora-extras-commits at redhat.com
Tue Feb 19 23:37:11 UTC 2008


Author: bjensen

Update of /cvs/pkgs/rpms/ax25-tools/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv971/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	ax25-tools-0.0.8-soundmodem.h.patch ax25-tools.spec 
Log Message:

Committing in ax25-tools for F8.

Modified Files:
 	F-8/.cvsignore F-8/sources 
Added Files:
 	F-8/ax25-tools-0.0.8-soundmodem.h.patch F-8/ax25-tools.spec 


ax25-tools-0.0.8-soundmodem.h.patch:

--- NEW FILE ax25-tools-0.0.8-soundmodem.h.patch ---
diff -urN ax25-tools-0.0.8.old/hdlcutil/hdrvcomm.h ax25-tools-0.0.8/hdlcutil/hdrvcomm.h
--- ax25-tools-0.0.8.old/hdlcutil/hdrvcomm.h	2001-04-09 19:10:48.000000000 -0700
+++ ax25-tools-0.0.8/hdlcutil/hdrvcomm.h	2004-01-23 23:51:18.000000000 -0800
@@ -42,7 +42,7 @@
 
 #ifdef HDRVC_KERNEL
 #include <linux/hdlcdrv.h>
-#include <linux/soundmodem.h>
+#include "soundmodem.h"
 #include <linux/baycom.h>
 #endif /* HDRVC_KERNEL */
 
diff -urN ax25-tools-0.0.8.old/hdlcutil/soundmodem.h ax25-tools-0.0.8/hdlcutil/soundmodem.h
--- ax25-tools-0.0.8.old/hdlcutil/soundmodem.h	1969-12-31 16:00:00.000000000 -0800
+++ ax25-tools-0.0.8/hdlcutil/soundmodem.h	2004-01-23 23:49:25.000000000 -0800
@@ -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 */
+
+/* --------------------------------------------------------------------- */


--- NEW FILE ax25-tools.spec ---
Name:           ax25-tools
Version:        0.0.8
Release:        2%{?dist}
Summary:        Tools used to configure an ax.25 enabled computer

Group:          Applications/Communications
License:        GPLv2+
URL:            http://ax25.sourceforge.net/
Source0:        http://downloads.sourceforge.net/ax25/%{name}-%{version}.tar.gz
#Patch by Daniel Schepler to include soundmodem.h, which was obsoleted and removed from the 2.6 kernel 
Patch0:         %{name}-%{version}-soundmodem.h.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libax25-devel
BuildRequires:  ncurses-devel
BuildRequires:  libXt-devel, fltk-devel

%description
ax25-tools is a collection of tools that are used to configure an ax.25 enabled
computer. They will configure interfaces and assign callsigns to ports as well
as Net/ROM and ROSE configuration.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

#don't include these twice
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%doc yamdrv/README.yamdrv user_call/README.user_call tcpip/ttylinkd.README dmascc/README.dmascc
%{_bindir}/*
%{_sbindir}/*
%{_mandir}/man?/*

%changelog 
* Sat Feb 16 2008 Robert 'Bob' Jensen <bob at bobjensen.com> 0.0.8-2
- Submit for review
* Thu Dec 06 2007 Sindre Pedersen Bjørdal <foolish at guezz.net> 0.0.8-1
- Initial Build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ax25-tools/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Feb 2008 17:41:34 -0000	1.1
+++ .cvsignore	19 Feb 2008 23:36:35 -0000	1.2
@@ -0,0 +1 @@
+ax25-tools-0.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ax25-tools/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Feb 2008 17:41:34 -0000	1.1
+++ sources	19 Feb 2008 23:36:35 -0000	1.2
@@ -0,0 +1 @@
+70172b979b38a9434f21d2e8152f0d5e  ax25-tools-0.0.8.tar.gz




More information about the fedora-extras-commits mailing list