Package: eagle-usb-modules-source
Version: 2.1.1-2
Followup-For: Bug #377326
It is a dirty patch, but has the advantage to make eagle usb compile
using module assistant with kernel 2.6.16.
compilateur:
gcc --version
gcc (GCC) 4.0.4 20060507 (prerelease) (Debian 4.0.3-3)
Issues are related to
* USE_CMVS (defined seems to solve the issue)
* .owner field (I do no use it, as it does not exist :-(
* URB_ASYNC_UNLINK (I put the value of usb.h from kernel 2.6.12, which
seems not existe in newer kernels)
diff -r -u reult:
:::::::::::::::::::::::::::::::::::::::::::
Seulement dans modules-1/eagle-usb: config.log
Seulement dans modules-1/eagle-usb: config.status
Seulement dans modules-1/eagle-usb: configure-stamp
Seulement dans modules-1/eagle-usb/debian: control
Seulement dans modules-1/eagle-usb/debian: postinst
diff -u -r modules-1/eagle-usb/driver/eu_main.c
jmg/modules/eagle-usb/driver/eu_main.c
--- modules-1/eagle-usb/driver/eu_main.c 2005-04-14
09:01:13.000000000 +0200
+++ jmg/modules/eagle-usb/driver/eu_main.c 2006-08-08
14:48:10.000000000 +0200
@@ -173,7 +173,7 @@
static struct usb_driver eu_driver =
{
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19)
- .owner = THIS_MODULE,
+ //FIXME: owner does not exist// .owner = THIS_MODULE,
#endif
.name = "eagle-usb",
.id_table = eu_ids,
@@ -1098,7 +1098,7 @@
usb_driver_release_interface ( &eu_driver, GET_INTF_PTR (usb,2) );
#endif
-#if USE_CMVS
+#if defined USE_CMVS
if ( ins->pDriverCMVs )
{
FREE_VBUFFER ( ins->pDriverCMVs );
@@ -1333,7 +1333,7 @@
case CASE_POSTFIRM:
switch (code)
{
-#if USE_CMVS
+#if defined USE_CMVS
case EU_IO_CMVS:
retval = -ERESTARTSYS;
if ( ins->flags & EU_OPEN )
@@ -1401,7 +1401,7 @@
*/
-#if USE_CMVS
+#if defined USE_CMVS
if ( ins->pDriverCMVs == NULL )
{
/* User as not yet sent EU_IO_CMVS */
Seulement dans modules-1/eagle-usb/driver: .eu_main.o.d
diff -u -r modules-1/eagle-usb/driver/eu_msg.c
jmg/modules/eagle-usb/driver/eu_msg.c
--- modules-1/eagle-usb/driver/eu_msg.c 2005-04-14 09:01:13.000000000
+0200
+++ jmg/modules/eagle-usb/driver/eu_msg.c 2006-08-08
14:45:40.000000000 +0200
@@ -480,7 +480,7 @@
eu_get_cgf_values ( ins, opt );
-#if USE_CMVS
+#if defined USE_CMVS
if ((pSm->LineType == 10) &&
(ins->pDriverCMVs[0].data!=0xF9F9F9F9)) /*Read from CMV text
file*/
{
@@ -579,7 +579,7 @@
* To tell modem it can go ahead to R_ACT_REQUEST state
*/
ADDMSG(pSm->MsgSeq_Retrainer, MsgCNTL0_INIT);
-#if USE_CMVS
+#if defined USE_CMVS
}
#endif /* USE_CMVS */
diff -u -r modules-1/eagle-usb/driver/eu_types.h
jmg/modules/eagle-usb/driver/eu_types.h
--- modules-1/eagle-usb/driver/eu_types.h 2005-04-14
09:01:13.000000000 +0200
+++ jmg/modules/eagle-usb/driver/eu_types.h 2006-08-08
14:41:13.000000000 +0200
@@ -51,7 +51,7 @@
#define EU_IO_SYNC _IO('U', 104)
#define EU_IO_GETDBG _IOWR('U', 105, struct eu_ioctl_info)
#define EU_IO_SETDBG _IOWR('U', 106, struct eu_ioctl_info)
-#if USE_CMVS
+#if defined USE_CMVS
#define EU_IO_CMVS _IOW('U', 107, struct eu_ioctl_info)
#endif
diff -u -r modules-1/eagle-usb/driver/macros.h
jmg/modules/eagle-usb/driver/macros.h
--- modules-1/eagle-usb/driver/macros.h 2005-04-14 09:01:13.000000000
+0200
+++ jmg/modules/eagle-usb/driver/macros.h 2006-08-08
15:16:56.000000000 +0200
@@ -55,6 +55,9 @@
#endif
+// URB misisng at compiling for kernel 2.6.16-2 on debian
+//#define URB_ASYNC_UNLINK USB_ASYNC_UNLINK
+#define URB_ASYNC_UNLINK 0x0010
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
/*
* Linux 2.6 introduces kmalloc flags
Seulement dans modules-1/eagle-usb/driver: .tmp_versions
Seulement dans modules-1/eagle-usb: Makefile.common
Seulement dans modules-1/: eagle-usb-old
:::::::::::::::::::::::::::::::::::::::::::
Regards
Bonne journée.
-- System Information:
Debian Release: testing/unstable
APT prefers testing
APT policy: (500, 'testing'), (500, 'stable')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.16-2-686
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Versions of packages eagle-usb-modules-source depends on:
ii debhelper 5.0.37.3 helper programs for debian/rules
ii make 3.81-2 The GNU version of the "make" util
Versions of packages eagle-usb-modules-source recommends:
pn kernel-package <none> (no description available)
ii module-assistant 0.10.4 tool to make module package creati
-- no debconf information
