rpms/mISDN/devel mISDNdebugtool.h, NONE, 1.1 .cvsignore, 1.5, 1.6 mISDN.spec, 1.5, 1.6 mISDNif.h, 1.2, 1.3 sources, 1.5, 1.6

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/extras/rpms/mISDN/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16251

Modified Files:
	.cvsignore mISDN.spec mISDNif.h sources 
Added Files:
	mISDNdebugtool.h 
Log Message:
1.1.5


--- NEW FILE mISDNdebugtool.h ---
#ifndef __mISDNdebugtool_H__
#define __mISDNdebugtool_H__

/*
 * 0        8        16       24      31
 * +--------+--------+--------+--------+
 * |  vers  |  type  |    reserved     +
 * +--------+--------+--------+--------+
 * |         stack identifier          +
 * +--------+--------+--------+--------+
 * |        seconds since epoch        |
 * +--------+--------+--------+--------+
 * |            nanoseconds            |
 * +--------+--------+--------+--------+
 * |          payload length           |
 * +--------+--------+--------+--------+
 */

enum mISDN_dt_type {

	D_RX = 1,  /* payload: copy of dchannel payload */
	D_TX,      /* payload: copy of dchannel payload */

	L1_UP,     /* no payload */
	L1_DOWN,   /* no payload */

	CRC_ERR,   /* no payload */

	NEWSTATE,  /* payload: state-id (uint) :: message (NULL-terminated charstring)
	              thrown by: hfcmulti */
};

typedef struct mISDN_dt_header {
	unsigned char version;
	unsigned char type;
	unsigned short reserved;
	unsigned int stack_id;
	unsigned int stack_protocol;
	struct timespec time;
	unsigned int plength;
} mISDN_dt_header_t;

#endif



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mISDN/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 May 2007 11:35:22 -0000	1.5
+++ .cvsignore	22 Aug 2007 16:29:17 -0000	1.6
@@ -1 +1 @@
-mISDNuser-1_1_3.tar.gz
+mISDNuser-1_1_5.tar.gz


Index: mISDN.spec
===================================================================
RCS file: /cvs/extras/rpms/mISDN/devel/mISDN.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mISDN.spec	30 May 2007 11:37:42 -0000	1.5
+++ mISDN.spec	22 Aug 2007 16:29:17 -0000	1.6
@@ -2,17 +2,18 @@
 %bcond_with utils
 
 Name:		mISDN
-Version:	1.1.3
+Version:	1.1.5
 Release:	1%{?dist}
 Summary:	Userspace part of Modular ISDN stack
 
 Group:		System Environment/Libraries
-License:	LGPL
+License:	LGPLv2+
 URL:		http://www.misdn.org/
-Source0:	http://www.misdn.org/downloads/releases/mISDNuser-1_1_3.tar.gz
-# From mISDN-1.0.4
+Source0:	http://www.misdn.org/downloads/releases/mISDNuser-1_1_5.tar.gz
+# From mISDN-1.1.5
 Source1:	mISDNif.h
-Source2:	mISDN.rules
+Source2:	mISDNdebugtool.h
+Source3:	mISDN.rules
 Patch0:		mISDN-build.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,10 +51,11 @@
 code. This package contains test utilities for mISDN.
 
 %prep
-%setup -q -n mISDNuser-1_1_3
+%setup -q -n mISDNuser-1_1_5
 %patch0 -p0
 mkdir include/linux
 cp %SOURCE1 include/linux
+cp %SOURCE2 include/linux
 rm -rf voip
 
 %build
@@ -65,8 +67,9 @@
 make install INSTALL_PREFIX=$RPM_BUILD_ROOT MISDNDIR=`pwd` LIBDIR=%_libdir
 mkdir $RPM_BUILD_ROOT/%{_includedir}/mISDNuser/linux
 install -m0644 %SOURCE1 $RPM_BUILD_ROOT/%{_includedir}/mISDNuser/linux/mISDNif.h
+install -m0644 %SOURCE2 $RPM_BUILD_ROOT/%{_includedir}/mISDNuser/linux/mISDNdebugtool.h
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d
-install -m0644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/mISDN.rules
+install -m0644 %SOURCE3 $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/mISDN.rules
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -102,6 +105,9 @@
 %endif
 
 %changelog
+* Wed Aug 22 2007 David Woodhouse <dwmw2 at infradead.org> 1.1.5-1
+- Update to 1.1.5
+
 * Wed May 30 2007 David Woodhouse <dwmw2 at infradead.org> 1.1.3-1
 - Update to 1.1.3
 


Index: mISDNif.h
===================================================================
RCS file: /cvs/extras/rpms/mISDN/devel/mISDNif.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mISDNif.h	23 Feb 2007 16:50:23 -0000	1.2
+++ mISDNif.h	22 Aug 2007 16:29:17 -0000	1.3
@@ -557,6 +557,7 @@
 #define mISDN_STACK_STOPPED	16
 #define mISDN_STACK_INIT	17
 #define mISDN_STACK_THREADSTART	18
+#define mISDN_STACK_DELETED	28
 #define mISDN_STACK_ACTIVE	29
 #define mISDN_STACK_RUNNING	30
 #define mISDN_STACK_KILLED	31
@@ -615,6 +616,7 @@
 	u16	param[MAX_LAYER_NR +1];
 	u16	global;
 	u16	pidx;
+	u_int modparm_protocol;
 	u_char	*pbuf;
 } mISDN_pid_t;
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mISDN/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 May 2007 11:35:22 -0000	1.5
+++ sources	22 Aug 2007 16:29:17 -0000	1.6
@@ -1 +1 @@
-546c42271307b0ffe1dd55fd899adda8  mISDNuser-1_1_3.tar.gz
+45bf90350ac8f8e1845c02e293126d70  mISDNuser-1_1_5.tar.gz