Attachment #286987 for bug #351225




include $(TOP)/config.mak
-include $(TOP)/modules/imported/makeflags.mak

CFLAGS +=	-I$(TOP)/modules/imported/include -I$(TOP)/modules/include
CFLAGS +=	$(IMPORTED_FRAMEWORK_DEFS) $(IMPORTED_GENERAL_DEFS)
CFLAGS +=	-DCNXTTARGET="\"$(CNXTTARGET)\""


	$(MKDIR) -p $@

$(CNXTTARGET)diag: diag.o modemexpert.o
	$(CC) ${LDFLAGS} -o $@ $^

$(CNXTTARGET)scr: scr.o
	$(CC) ${CFLAGS} ${LDFLAGS} -o $@ $^

$(CNXTTARGET)dmp: dmp.o
	$(CC) ${CFLAGS} ${LDFLAGS} -o $@ $^

clean:
	rm -f *.o $(ALL)

Lines 197-203 Link Here

(-)hsfmodem-7.80.02.06full.orig/modules/GPL/oscompat.h (-1 / +3 lines)
197	* interrupt.	197	* interrupt.
198	*/	198	*/
199		199
200	#ifdef STATIC_TQUEUE_LOCK	200	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
		201	static DEFINE_SPINLOCK(tqueue_lock);
		202	#elif defined(STATIC_TQUEUE_LOCK)
201	static spinlock_t tqueue_lock __attribute__((unused)) = SPIN_LOCK_UNLOCKED;	203	static spinlock_t tqueue_lock __attribute__((unused)) = SPIN_LOCK_UNLOCKED;
202	#else	204	#else
203	extern spinlock_t tqueue_lock;	205	extern spinlock_t tqueue_lock;

Lines 1063-1069 Link Here

(-)hsfmodem-7.80.02.06full.orig/modules/GPL/serial_cnxt.c (+4 lines)
1063		1063
1064		1064
1065	#ifndef FOUND_UART_REGISTER_PORT	1065	#ifndef FOUND_UART_REGISTER_PORT
		1066	#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37)
1066	static DECLARE_MUTEX(cnxt_port_sem);	1067	static DECLARE_MUTEX(cnxt_port_sem);
		1068	#else
		1069	static DEFINE_SEMAPHORE(cnxt_port_sem);
		1070	#endif
1067		1071
1068	/**	1072	/**
1069	* uart_register_port - register a serial port	1073	* uart_register_port - register a serial port

Lines 28-34 Link Here

(-)hsfmodem-7.80.02.06full.orig/modules/osdcp.c (+4 lines)
28	#define DCP_SAMPLE_SIZE sizeof(INT16)	28	#define DCP_SAMPLE_SIZE sizeof(INT16)
29		29
30	static struct list_head dcp_instance_list = LIST_HEAD_INIT(dcp_instance_list);	30	static struct list_head dcp_instance_list = LIST_HEAD_INIT(dcp_instance_list);
		31	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
		32	static DEFINE_SPINLOCK(dcp_lock);
		33	#else
31	static spinlock_t dcp_lock = SPIN_LOCK_UNLOCKED;	34	static spinlock_t dcp_lock = SPIN_LOCK_UNLOCKED;
		35	#endif
32	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,2)	36	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,2)
33	#ifdef FOUND_CLASS_SIMPLE	37	#ifdef FOUND_CLASS_SIMPLE
34	static struct class_simple *dcp_class;	38	static struct class_simple *dcp_class;

Lines 30-36 Link Here

(-)hsfmodem-7.80.02.06full.orig/modules/osdiag.c (+6 lines)
30	#define DIAG_NOTIFY_RINGBUF_ELEMENTS 100	30	#define DIAG_NOTIFY_RINGBUF_ELEMENTS 100
31		31
32	static struct list_head diag_instance_list = LIST_HEAD_INIT(diag_instance_list);	32	static struct list_head diag_instance_list = LIST_HEAD_INIT(diag_instance_list);
		33	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
		34	static DEFINE_SPINLOCK(diag_lock);
		35	#else
33	static spinlock_t diag_lock = SPIN_LOCK_UNLOCKED;	36	static spinlock_t diag_lock = SPIN_LOCK_UNLOCKED;
		37	#endif
34	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,2)	38	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,2)
35	#ifdef FOUND_CLASS_SIMPLE	39	#ifdef FOUND_CLASS_SIMPLE
36	static struct class_simple *diag_class;	40	static struct class_simple *diag_class;
Lines 599-605 Link Here
599		603
600	static struct file_operations diag_fops = {	604	static struct file_operations diag_fops = {
601	.owner = THIS_MODULE,	605	.owner = THIS_MODULE,
		606	#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36)
602	.ioctl = diag_ioctl,	607	.ioctl = diag_ioctl,
		608	#endif
603	.fasync = diag_fasync,	609	.fasync = diag_fasync,
604	.poll = diag_poll,	610	.poll = diag_poll,
605	.read = diag_read,	611	.read = diag_read,

Lines 36-42 Link Here

(-)hsfmodem-7.80.02.06full.orig/modules/osfloat.c (+4 lines)
36		36
37	static fpstate_t fpstates[NFPSTATES];	37	static fpstate_t fpstates[NFPSTATES];
38		38
		39	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
		40	static DEFINE_SPINLOCK(fpstates_lock);
		41	#else
39	static spinlock_t fpstates_lock __attribute__((unused)) = SPIN_LOCK_UNLOCKED;	42	static spinlock_t fpstates_lock __attribute__((unused)) = SPIN_LOCK_UNLOCKED;
		43	#endif
40		44
41	static inline void	45	static inline void
42	hsf_kernel_fpu_begin(fpstate_t *fpstate)	46	hsf_kernel_fpu_begin(fpstate_t *fpstate)

Lines 405-411 Link Here

(-)hsfmodem-7.80.02.06full.orig/modules/osnvm.c (+4 lines)
405	static LIST_HEAD(nvmelem_writelist);	405	static LIST_HEAD(nvmelem_writelist);
406	static LIST_HEAD(nvm_newinst_list);	406	static LIST_HEAD(nvm_newinst_list);
407		407
		408	#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37)
408	static DECLARE_MUTEX(nvmelem_writelist_sem);	409	static DECLARE_MUTEX(nvmelem_writelist_sem);
		410	#else
		411	static DEFINE_SEMAPHORE(nvmelem_writelist_sem);
		412	#endif
409		413
410	/* nvmelem_writelist_sem must be held by caller */	414	/* nvmelem_writelist_sem must be held by caller */
411	static BOOL NVM_WriteListAppend(const char *pathname, PVOID pBuf, UINT32 dwSize, enum NVM_FORMAT nvmFormat)	415	static BOOL NVM_WriteListAppend(const char *pathname, PVOID pBuf, UINT32 dwSize, enum NVM_FORMAT nvmFormat)

Lines 48-54 Link Here

(-)hsfmodem-7.80.02.06full.orig/modules/osservices.c (+15 lines)
48	#include <linux/delay.h>	48	#include <linux/delay.h>
49	#include <linux/vmalloc.h>	49	#include <linux/vmalloc.h>
50	#include <linux/slab.h>	50	#include <linux/slab.h>
		51	#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39))
51	#include <linux/smp_lock.h>	52	#include <linux/smp_lock.h>
		53	#endif
52	#include <linux/file.h>	54	#include <linux/file.h>
53	#include <linux/kmod.h>	55	#include <linux/kmod.h>
54		56
Lines 284-290 Link Here
284		286
285	/********************************************************************/	287	/********************************************************************/
286		288
		289	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
		290	static DEFINE_SEMAPHORE(current_sem);
		291	static DEFINE_SPINLOCK(atomic_lock);
		292	#else
287	static spinlock_t atomic_lock __attribute__((unused)) = SPIN_LOCK_UNLOCKED;	293	static spinlock_t atomic_lock __attribute__((unused)) = SPIN_LOCK_UNLOCKED;
		294	#endif
288		295
289	/****************************************************************************************	296	/****************************************************************************************
290	The OsAtomicCompareAndSwap function compares the value at the specified address with	297	The OsAtomicCompareAndSwap function compares the value at the specified address with
Lines 465-471 Link Here
465	#endif	472	#endif
466	#endif	473	#endif
467		474
		475	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
		476	down(&current_sem);
		477	#else
468	lock_kernel();	478	lock_kernel();
		479	#endif
469		480
470	#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) )	481	#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) )
471	exit_mm(current);	482	exit_mm(current);
Lines 499-505 Link Here
499	#endif	510	#endif
500	}	511	}
501		512
		513	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
		514	up(&current_sem);
		515	#else
502	unlock_kernel();	516	unlock_kernel();
		517	#endif
503		518
504	#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) )	519	#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) )
505	flush_signals(current); /* must be called without spinlock */	520	flush_signals(current); /* must be called without spinlock */

Lines 158-164 Link Here

(-)hsfmodem-7.80.02.06x86_64full.orig/modules/Makefile (-1 / +1 lines)
158	ifeq ($(ON_BUILD_SYSTEM)-$(CONFIG_SND_HDA_INTEL),no-)	158	ifeq ($(ON_BUILD_SYSTEM)-$(CONFIG_SND_HDA_INTEL),no-)
159	# On Ubuntu Gutsy (7.10), the HDA modules are not included in linux-image but in a seprarate package	159	# On Ubuntu Gutsy (7.10), the HDA modules are not included in linux-image but in a seprarate package
160	# and CONFIG_SND_HDA_INTEL is not enabled in the kernel .config file	160	# and CONFIG_SND_HDA_INTEL is not enabled in the kernel .config file
161	CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y \|\| echo n)	161	# CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y \|\| echo n)
162	endif	162	endif
163		163
164	MODULAR_HDA := $(shell test -e ${REAL_KERNELSRC}/include/sound/hda_codec.h && echo yes \|\| echo no)	164	MODULAR_HDA := $(shell test -e ${REAL_KERNELSRC}/include/sound/hda_codec.h && echo yes \|\| echo no)

Lines 2027-2035 Link Here

(-)hsfmodem-7.80.02.06x86_64full.orig/scripts/cnxtconfig.in (-2 / +2 lines)
2027	if [ -d /etc/udev/rules.d ]; then	2027	if [ -d /etc/udev/rules.d ]; then
2028	rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules	2028	rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules
2029	if [ "@CNXTDRIVER@" = "dgc" ]; then	2029	if [ "@CNXTDRIVER@" = "dgc" ]; then
2030	echo 'KERNEL=="ttyACM0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules	2030	echo 'KERNEL=="ttyACM0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/99-@CNXTTARGET@.rules
2031	else	2031	else
2032	echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules	2032	echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/99-@CNXTTARGET@.rules
2033	fi	2033	fi
2034	fi	2034	fi
2035		2035




#
# chkconfig: 2345 09 91
# description: @CNXTDRVDSC@
#
### BEGIN INIT INFO
# Provides: @CNXTTARGET@
# Should-Start: hotplug coldplug
# Required-Start: $local_fs
# Required-Stop: $network
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Description: Start @CNXTDRVDSC@
### END INIT INFO

start() {
	ebegin "Starting @CNXTDRVDSC@"
	endcmd="eend"
else
	begincmd="echo"
	endcmd="/bin/true"
fi


start()
{
	${begincmd} "Starting @CNXTDRVDSC@"
	@CNXTSBINDIR@/@CNXTTARGET@config --rcstart
	eend 0
}

stop() {
	ebegin "Stopping @CNXTDRVDSC@"
	${begincmd} "Stopping @CNXTDRVDSC@"
	@CNXTSBINDIR@/@CNXTTARGET@config --rcstop
	eend 0
}

restart()
{
	stop
	start
}

if [ ! -e /etc/runlevels ]; then
	case "$1" in
      start)
			start
			;;
      stop)
			stop
			;;
      restart|force-reload|reload)
			restart
			;;
      status)
			exit 3
			;;
      *)
			echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
			exit 1
			;;
	esac
fi

Return to bug 351225

Lines 10-16 Link Here

(-)hsfmodem-7.80.02.06x86_64full.orig/diag/makefile (-4 / +4 lines)
10	include $(TOP)/config.mak	10	include $(TOP)/config.mak
11	-include $(TOP)/modules/imported/makeflags.mak	11	-include $(TOP)/modules/imported/makeflags.mak
12		12
13	CFLAGS = -I$(TOP)/modules/imported/include -I$(TOP)/modules/include	13	CFLAGS += -I$(TOP)/modules/imported/include -I$(TOP)/modules/include
14	CFLAGS += $(IMPORTED_FRAMEWORK_DEFS) $(IMPORTED_GENERAL_DEFS)	14	CFLAGS += $(IMPORTED_FRAMEWORK_DEFS) $(IMPORTED_GENERAL_DEFS)
15	CFLAGS += -DCNXTTARGET="\"$(CNXTTARGET)\""	15	CFLAGS += -DCNXTTARGET="\"$(CNXTTARGET)\""
16		16
Lines 41-53 Link Here
41	$(MKDIR) -p $@	41	$(MKDIR) -p $@
42		42
43	$(CNXTTARGET)diag: diag.o modemexpert.o	43	$(CNXTTARGET)diag: diag.o modemexpert.o
44	$(CC) -o $@ $^	44	$(CC) ${LDFLAGS} -o $@ $^
45		45
46	$(CNXTTARGET)scr: scr.o	46	$(CNXTTARGET)scr: scr.o
47	$(CC) -o $@ $^	47	$(CC) ${CFLAGS} ${LDFLAGS} -o $@ $^
48		48
49	$(CNXTTARGET)dmp: dmp.o	49	$(CNXTTARGET)dmp: dmp.o
50	$(CC) -o $@ $^	50	$(CC) ${CFLAGS} ${LDFLAGS} -o $@ $^
51		51
52	clean:	52	clean:
53	rm -f *.o $(ALL)	53	rm -f *.o $(ALL)

Lines 1-63 Link Here

(-)hsfmodem-7.80.02.06x86_64full.orig/scripts/rccnxt.in (-57 / +6 lines)
1	#
2	# chkconfig: 2345 09 91
3	# description: @CNXTDRVDSC@
4	#
5	### BEGIN INIT INFO
6	# Provides: @CNXTTARGET@
7	# Should-Start: hotplug coldplug
8	# Required-Start: $local_fs
9	# Required-Stop: $network
10	# Default-Start: 3 5
11	# Default-Stop: 0 1 2 6
12	# Description: Start @CNXTDRVDSC@
13	### END INIT INFO
14		1
15	if [ -e /etc/runlevels ]; then	2	start() {
16	begincmd="ebegin"	3	ebegin "Starting @CNXTDRVDSC@"
17	endcmd="eend"
18	else
19	begincmd="echo"
20	endcmd="/bin/true"
21	fi
22
23
24	start()
25	{
26	${begincmd} "Starting @CNXTDRVDSC@"
27	@CNXTSBINDIR@/@CNXTTARGET@config --rcstart	4	@CNXTSBINDIR@/@CNXTTARGET@config --rcstart
28	${endcmd} 0	5	eend 0
29	}	6	}
30		7
31	stop()	8	stop() {
32	{	9	ebegin "Stopping @CNXTDRVDSC@"
33	${begincmd} "Stopping @CNXTDRVDSC@"
34	@CNXTSBINDIR@/@CNXTTARGET@config --rcstop	10	@CNXTSBINDIR@/@CNXTTARGET@config --rcstop
35	${endcmd} 0	11	eend 0
36	}	12	}
37
38	restart()
39	{
40	stop
41	start
42	}
43
44	if [ ! -e /etc/runlevels ]; then
45	case "$1" in
46	start)
47	start
48	;;
49	stop)
50	stop
51	;;
52	restart\|force-reload\|reload)
53	restart
54	;;
55	status)
56	exit 3
57	;;
58	*)
59	echo "Usage: $0 {start\|stop\|status\|try-restart\|restart\|force-reload\|reload}"
60	exit 1
61	;;
62	esac
63	fi