From 9ad0e03b94bf32fbb71f0b43671071e723880616 Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Wed, 27 Jun 2007 21:34:59 +0000 Subject: amd64 later 2.6 kernel fixes thanks to Miroslaw Mieszczak in bug 163366 Package-Manager: portage-2.1.3_rc5 --- net-dialup/fritzcapi/ChangeLog | 9 +- net-dialup/fritzcapi/Manifest | 38 +- .../fritzcapi/files/2.6.43-fcpcmcia.amd64.patch | 599 +++++++++++++++++++++ .../2.6.43-linux-2.6.19-irq_handler.amd64.patch | 78 +++ .../fritzcapi/files/fritzcapi-2.6.20.amd64.patch | 12 + net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild | 16 +- 6 files changed, 728 insertions(+), 24 deletions(-) create mode 100644 net-dialup/fritzcapi/files/2.6.43-fcpcmcia.amd64.patch create mode 100644 net-dialup/fritzcapi/files/2.6.43-linux-2.6.19-irq_handler.amd64.patch create mode 100644 net-dialup/fritzcapi/files/fritzcapi-2.6.20.amd64.patch (limited to 'net-dialup/fritzcapi') diff --git a/net-dialup/fritzcapi/ChangeLog b/net-dialup/fritzcapi/ChangeLog index f05a7f5cb7e8..5b3ada080857 100644 --- a/net-dialup/fritzcapi/ChangeLog +++ b/net-dialup/fritzcapi/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-dialup/fritzcapi # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.30 2007/05/02 07:53:25 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.31 2007/06/27 21:34:59 genstef Exp $ + + 27 Jun 2007; Stefan Schweizer + +files/2.6.43-linux-2.6.19-irq_handler.amd64.patch, + +files/fritzcapi-2.6.20.amd64.patch, +files/2.6.43-fcpcmcia.amd64.patch, + fritzcapi-2.6.43.ebuild: + amd64 later 2.6 kernel fixes thanks to Miroslaw Mieszczak + in bug 163366 02 May 2007; Marius Mauch fritzcapi-2.6.43.ebuild: Replacing einfo with elog diff --git a/net-dialup/fritzcapi/Manifest b/net-dialup/fritzcapi/Manifest index dfb93947ec3b..0fd9439d7124 100644 --- a/net-dialup/fritzcapi/Manifest +++ b/net-dialup/fritzcapi/Manifest @@ -1,10 +1,15 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX 2.6.43-fcpcmcia.amd64.patch 18215 RMD160 e44a890617a725c5d275359e10d3e54bc0aa73a3 SHA1 986316eaf2ad505489b076f639a022bf69ae0f57 SHA256 336411117944f827439adb6b73a41cbc11ef6d9183f06770e2e5077246bdeb9b +MD5 e8b4a8ee535f88950f3d811e9a022c64 files/2.6.43-fcpcmcia.amd64.patch 18215 +RMD160 e44a890617a725c5d275359e10d3e54bc0aa73a3 files/2.6.43-fcpcmcia.amd64.patch 18215 +SHA256 336411117944f827439adb6b73a41cbc11ef6d9183f06770e2e5077246bdeb9b files/2.6.43-fcpcmcia.amd64.patch 18215 AUX 2.6.43-fcpcmcia.patch 19228 RMD160 635959d15326b93ebc5e84a5696a744f3ea49027 SHA1 97374936d420f4b2ce289f030f7f620af4d8ebb9 SHA256 236d4317ce27c043a0f4ead448fdea3bb506ffbf0e2554453f6937181241eea0 MD5 4d48b89598788213bd7b9987ab890bc5 files/2.6.43-fcpcmcia.patch 19228 RMD160 635959d15326b93ebc5e84a5696a744f3ea49027 files/2.6.43-fcpcmcia.patch 19228 SHA256 236d4317ce27c043a0f4ead448fdea3bb506ffbf0e2554453f6937181241eea0 files/2.6.43-fcpcmcia.patch 19228 +AUX 2.6.43-linux-2.6.19-irq_handler.amd64.patch 3418 RMD160 8ef21ea3a1d46e56cd711e205849c2491779e6f2 SHA1 b68bd20809939b75628436147aeea713b5a1aea1 SHA256 1084d798c9a54bc5f1f00d746be302cdc5a893db14484c1dce96c0002a393147 +MD5 61fa02c18ed2eb29193b6edda9e5687c files/2.6.43-linux-2.6.19-irq_handler.amd64.patch 3418 +RMD160 8ef21ea3a1d46e56cd711e205849c2491779e6f2 files/2.6.43-linux-2.6.19-irq_handler.amd64.patch 3418 +SHA256 1084d798c9a54bc5f1f00d746be302cdc5a893db14484c1dce96c0002a393147 files/2.6.43-linux-2.6.19-irq_handler.amd64.patch 3418 AUX 2.6.43-linux-2.6.19-irq_handler.patch 6472 RMD160 a899fc6f602b0bb988ab68aa82c3947ca3f3b139 SHA1 2d89534668665afc71b0476bd4e4749f4cd80067 SHA256 b9df1c8677a29e25c77b65d0b219b4ddbcc373a9dd628ac0a79dfb3c1c3a57e8 MD5 718ece9c17590750a4b13679c1302596 files/2.6.43-linux-2.6.19-irq_handler.patch 6472 RMD160 a899fc6f602b0bb988ab68aa82c3947ca3f3b139 files/2.6.43-linux-2.6.19-irq_handler.patch 6472 @@ -13,20 +18,24 @@ AUX fcusb2-2.6.19.patch 396 RMD160 923e9cfcc98cca937cb5311db09d8c4b6d913442 SHA1 MD5 c768ffb3ac0290117fbe06c6862a2b5b files/fcusb2-2.6.19.patch 396 RMD160 923e9cfcc98cca937cb5311db09d8c4b6d913442 files/fcusb2-2.6.19.patch 396 SHA256 67541e2783e105ce1d7ca9f4d76fff7fb1f9cb9acc74a21c9d375b40d5df01b3 files/fcusb2-2.6.19.patch 396 +AUX fritzcapi-2.6.20.amd64.patch 586 RMD160 22ffeb87d46a08fec992d19320d474323dce8a30 SHA1 8237450b4224ab105e1b8bc1fe07212a9c3c5326 SHA256 5f42a0366a92d769a0c868e6fe73710fbba3c834a1e744c6bb86cb29f64d5068 +MD5 4951eab4a95d915a68c54832288adacc files/fritzcapi-2.6.20.amd64.patch 586 +RMD160 22ffeb87d46a08fec992d19320d474323dce8a30 files/fritzcapi-2.6.20.amd64.patch 586 +SHA256 5f42a0366a92d769a0c868e6fe73710fbba3c834a1e744c6bb86cb29f64d5068 files/fritzcapi-2.6.20.amd64.patch 586 AUX fritzcapi-2.6.20.patch 3500 RMD160 670766ffe9f17e2953c5413163a45158da0f608a SHA1 2bdcf2b28a048d2bd65d3c6a3eec70668559ad1f SHA256 6d919ea803b79caced2bdd0b35efbc739131ceb65904d14e58927d5b7875bc5e MD5 e2e21b27a9f8187de54c70804f201e1e files/fritzcapi-2.6.20.patch 3500 RMD160 670766ffe9f17e2953c5413163a45158da0f608a files/fritzcapi-2.6.20.patch 3500 SHA256 6d919ea803b79caced2bdd0b35efbc739131ceb65904d14e58927d5b7875bc5e files/fritzcapi-2.6.20.patch 3500 DIST km_fritzcapi-2.6-43.i586.rpm 2991322 RMD160 a300b383d474ddf9283c1bd9fae310be196c0199 SHA1 80768055694913b706075fa03f15a7477ef29a3f SHA256 e90827d8c2b53dc475c97be8c8a018777830519592bc9e25ef1a49389d12e475 DIST km_fritzcapi-2.6-43.x86_64.rpm 1006645 RMD160 7338380933345b211ba92654565c78cf4ad793ca SHA1 f7e5d9cf8c43db73b4e0c4fcb76753af74b6e743 SHA256 506ff28f5fd1d70969378d52d5d48f9937b585556a4a5475bbfd92865b74a860 -EBUILD fritzcapi-2.6.43.ebuild 5301 RMD160 f923512c088ba6d6f70d2f7d2e6d454e2fd7c7e4 SHA1 abf80d1b9d980ed3a947aba5c5669acf74933625 SHA256 7d96faaa3d4e62daaab92fd458ea55e55319d0ae210bddba634c8643dae2710c -MD5 9baab40480cdbfe055df52fb7d1d05d9 fritzcapi-2.6.43.ebuild 5301 -RMD160 f923512c088ba6d6f70d2f7d2e6d454e2fd7c7e4 fritzcapi-2.6.43.ebuild 5301 -SHA256 7d96faaa3d4e62daaab92fd458ea55e55319d0ae210bddba634c8643dae2710c fritzcapi-2.6.43.ebuild 5301 -MISC ChangeLog 5599 RMD160 779078b9e544d8170ce2bf9dc5a40a052f1cb384 SHA1 fd63288b9fdd78e72bc44af77f944d280de56124 SHA256 5d310bae439836fb19362f5578ac46713d46183df229398ae1d11961346c6f89 -MD5 1603f3184fc98d866387684956150291 ChangeLog 5599 -RMD160 779078b9e544d8170ce2bf9dc5a40a052f1cb384 ChangeLog 5599 -SHA256 5d310bae439836fb19362f5578ac46713d46183df229398ae1d11961346c6f89 ChangeLog 5599 +EBUILD fritzcapi-2.6.43.ebuild 5555 RMD160 1164a7a4ee1fc805ca479dbc189965a38b47ce40 SHA1 32cc3aaf248758c7206eb1ed18a92eb690d24e0e SHA256 b870c8f9f12f88638a6399c08f40f07b8715a6e24db069391f5466a6df1d51f0 +MD5 b4d64f67965f60c238d00debfe97029b fritzcapi-2.6.43.ebuild 5555 +RMD160 1164a7a4ee1fc805ca479dbc189965a38b47ce40 fritzcapi-2.6.43.ebuild 5555 +SHA256 b870c8f9f12f88638a6399c08f40f07b8715a6e24db069391f5466a6df1d51f0 fritzcapi-2.6.43.ebuild 5555 +MISC ChangeLog 5913 RMD160 33714bdfeaf0a38d0f77dc6b28340b7d4d8981ce SHA1 96309976bd255b0ae532809ff2344ebad490e942 SHA256 a83318b277630904dccbce8d60ace9ab5f92dd3afe717fb393be6966390c63ee +MD5 6258119d1980e54c3fe2368ae5869c2c ChangeLog 5913 +RMD160 33714bdfeaf0a38d0f77dc6b28340b7d4d8981ce ChangeLog 5913 +SHA256 a83318b277630904dccbce8d60ace9ab5f92dd3afe717fb393be6966390c63ee ChangeLog 5913 MISC metadata.xml 319 RMD160 d4d008a13689fabae0994a25a60961b2fc5e6269 SHA1 bfea39d327ea986c5fc5e31864ce1bfeccb2f4d9 SHA256 ce891f4c7e75069036c8c422a1502ce9bbd4670be2e7f918dfa9da5e917787fc MD5 0498b76c69caf75c82ab7115df4cd4f8 metadata.xml 319 RMD160 d4d008a13689fabae0994a25a60961b2fc5e6269 metadata.xml 319 @@ -34,10 +43,3 @@ SHA256 ce891f4c7e75069036c8c422a1502ce9bbd4670be2e7f918dfa9da5e917787fc metadata MD5 028f9d03268a88f75ab13f1c31f83767 files/digest-fritzcapi-2.6.43 542 RMD160 95e382f60944777de7af81a40d80732e347a3a4c files/digest-fritzcapi-2.6.43 542 SHA256 60364bdf51ef70f8c4f4a53eb1aead745b1266cd09d855c1fa842a309aeae1ef files/digest-fritzcapi-2.6.43 542 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) - -iD8DBQFGOELt6J2i8a8J4okRAh9qAKCsb4NHHqkYF6Do/nt7EXdhTPeaiwCgzjYG -M0ow6WyYa2BcOeDUAKoX43U= -=cX+k ------END PGP SIGNATURE----- diff --git a/net-dialup/fritzcapi/files/2.6.43-fcpcmcia.amd64.patch b/net-dialup/fritzcapi/files/2.6.43-fcpcmcia.amd64.patch new file mode 100644 index 000000000000..440e036a1510 --- /dev/null +++ b/net-dialup/fritzcapi/files/2.6.43-fcpcmcia.amd64.patch @@ -0,0 +1,599 @@ +diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.h usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.h +--- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.h 2005-07-07 00:00:00.000000000 +0200 ++++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.h 2007-01-25 11:39:11.000000000 +0100 +@@ -23,7 +23,6 @@ + #ifndef __have_driver_h__ + #define __have_driver_h__ + +-#include + #include + #include + #include +diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/fcpcmcia_cs.c usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/fcpcmcia_cs.c +--- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/fcpcmcia_cs.c 2006-01-30 17:09:05.000000000 +0100 ++++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/fcpcmcia_cs.c 2007-02-05 21:43:14.000000000 +0100 +@@ -46,7 +46,6 @@ + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) + #define PCMCIA_IRQ_INFO2 + #endif +-#define NEW_PCMCIA_DRV + + /*====================================================================*/ + MODULE_LICENSE("GPL"); +@@ -111,13 +110,9 @@ + handler. + */ + +-static void cs_config(dev_link_t *); +-static void cs_release(dev_link_t *); +-#ifdef NEW_PCMCIA_DRV +-static void cs_detach(struct pcmcia_device *p_dev); +-static int cs_attach(struct pcmcia_device *p_dev); +-#else +-static int cs_event(event_t event, int priority, event_callback_args_t *); ++static int cs_config(struct pcmcia_device *link); ++static void cs_release(struct pcmcia_device *link); ++ + + /* + The attach() and detach() entry points are used to create and destroy +@@ -125,48 +120,33 @@ + needed to manage one actual PCMCIA card. + */ + +-static dev_link_t * cs_attach(void); +-static void cs_detach(dev_link_t *); +-/* +- The dev_info variable is the "key" that is used to match up this +- device driver with appropriate cards, through the card configuration +- database. +-*/ ++static void cs_detach(struct pcmcia_device *p_dev); + +-static dev_info_t dev_info = "fcpcmcia_cs"; + + /* + A linked list of "instances" of the skeleton device. Each actual + PCMCIA card corresponds to one device instance, and is described +- by one dev_link_t structure (defined in ds.h). ++ by one struct pcmcia_device structure (defined in ds.h). + + You may not want to use a linked list for this -- for example, the +- memory card driver uses an array of dev_link_t pointers, where minor ++ memory card driver uses an array of struct pcmcia_device pointers, where minor + device numbers are used to derive the corresponding array index. + */ + +-static dev_link_t *dev_list = NULL; + +-#endif + /* +- A dev_link_t structure has fields for most things that are needed +- to keep track of a socket, but there will usually be some device +- specific information that also needs to be kept track of. The +- 'priv' pointer in a dev_link_t structure can be used to point to +- a device-specific private data structure, like this. +- + A driver needs to provide a dev_node_t structure for each device + on a card. In some cases, there is only one device per card (for + example, ethernet cards, modems). In other cases, there may be + many actual or logical devices (SCSI adapters, memory cards with + multiple partitions). The dev_node_t structures need to be kept +- in a linked list starting at the 'dev' field of a dev_link_t ++ in a linked list starting at the 'dev' field of a struct pcmcia_device + structure. We allocate them in the card's private data structure, + because they generally can't be allocated dynamically. + */ + + typedef struct local_info_t { +- dev_node_t node; ++ dev_node_t node; + } local_info_t; + + /*====================================================================== +@@ -181,101 +161,52 @@ + + ======================================================================*/ + +-#ifdef NEW_PCMCIA_DRV +-static int cs_attach(struct pcmcia_device *p_dev) ++static int cs_probe(struct pcmcia_device *p_dev) + { +-#else +-static dev_link_t *cs_attach(void) +-{ +- client_reg_t client_reg; +- int ret; +-#endif +- dev_link_t *link; +- local_info_t *local; ++ local_info_t *local; + #if defined (PCMCIA_IRQ_INFO2) +- int i; ++ int i; + #endif + +- NOTE("Attaching device...\n"); ++ NOTE("Attaching device...\n"); + +- /* Initialize the dev_link_t structure */ +- link = kmalloc(sizeof(struct dev_link_t), GFP_KERNEL); +- if (!link) +- goto err; +- memset(link, 0, sizeof(struct dev_link_t)); +- +- /* The io structure describes IO port mapping */ +- link->io.NumPorts1 = 16; +- link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; +- link->io.NumPorts2 = 0; ++ /* The io structure describes IO port mapping */ ++ p_dev->io.NumPorts1 = 16; ++ p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; ++ p_dev->io.NumPorts2 = 0; + +- /* Interrupt setup */ +- link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; ++ /* Interrupt setup */ ++ p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; + + #if defined (PCMCIA_IRQ_INFO2) +- link->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID; +- if (irq_list_count > 0) { +- for (i = 0; (i < irq_list_count) && (irq_list[i] > 0); i++) +- link->irq.IRQInfo2 |= 1 << irq_list[i]; +- } else { +- for (i = 0; (i < irq_list_count) && (default_irq_list[i] > 0); i++) +- link->irq.IRQInfo2 |= 1 << default_irq_list[i]; +- } ++ p_dev->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID; ++ if (irq_list_count > 0) { ++ for (i = 0; (i < irq_list_count) && (irq_list[i] > 0); i++) ++ p_dev->irq.IRQInfo2 |= 1 << irq_list[i]; ++ } else { ++ for (i = 0; (i < irq_list_count) && (default_irq_list[i] > 0); i++) ++ p_dev->irq.IRQInfo2 |= 1 << default_irq_list[i]; ++ } + #else +- link->irq.IRQInfo1 = IRQ_LEVEL_ID; ++ p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; + #endif + +- /* General socket configuration */ +- link->conf.Attributes = CONF_ENABLE_IRQ; +- link->conf.Vcc = 50; +- link->conf.IntType = INT_MEMORY_AND_IO; +- link->conf.ConfigIndex = 1; +- link->conf.Present = PRESENT_OPTION; +- +- /* Allocate space for private device-specific data */ +- local = kmalloc(sizeof(local_info_t), GFP_KERNEL); +- if (!local) +- goto err_kfree; +- memset(local, 0, sizeof(local_info_t)); +- link->priv = local; +- +-#ifdef NEW_PCMCIA_DRV +- link->handle = p_dev; +- p_dev->instance = link; +- link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; +- cs_config(link); +- return 0; +-#else +- /* Register with Card Services */ +- link->next = dev_list; +- dev_list = link; +- client_reg.dev_info = &dev_info; +-#if 0 +- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE; +- client_reg.EventMask = +- CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | +- CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | +- CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; +- client_reg.event_handler = &cs_event; +-#endif +- client_reg.Version = 0x0210; +- client_reg.event_callback_args.client_data = link; +- ret = pcmcia_register_client(&link->handle, &client_reg); +- if (ret != 0) { +- cs_error(link->handle, RegisterClient, ret); +- cs_detach(link); +- goto err; +- } +- return link; +-#endif +- err_kfree: +- kfree(link); +- err: +-#ifdef NEW_PCMCIA_DRV +- return -EINVAL; +-#else +- return NULL; +-#endif ++ /* General socket configuration */ ++ p_dev->conf.Attributes = CONF_ENABLE_IRQ; ++ p_dev->conf.IntType = INT_MEMORY_AND_IO; ++ p_dev->conf.ConfigIndex = 1; ++ p_dev->conf.Present = PRESENT_OPTION; ++ ++ /* Allocate space for private device-specific data */ ++ local = kmalloc(sizeof(local_info_t), GFP_KERNEL); ++ if (!local) ++ goto err_kfree; ++ memset(local, 0, sizeof(local_info_t)); ++ p_dev->priv = local; ++ return cs_config(p_dev); ++ ++err_kfree: ++ return -ENOMEM; + } /* cs_attach */ + + /*====================================================================== +@@ -286,47 +217,12 @@ + when the device is released. + + ======================================================================*/ +-#ifdef NEW_PCMCIA_DRV +-static void cs_detach(struct pcmcia_device *p_dev) +-{ +- dev_link_t *link = dev_to_instance(p_dev); + +- if (link->state & DEV_CONFIG) +- cs_release(link); +-#else +-static void cs_detach(dev_link_t *link) ++static void cs_detach(struct pcmcia_device *link) + { +- dev_link_t **linkp; +- +- NOTE("Detaching device...\n"); +- +- /* Locate device structure */ +- for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next) +- if (*linkp == link) break; +- if (*linkp == NULL) +- return; +- +- /* +- If the device is currently configured and active, we won't +- actually delete it yet. Instead, it is marked so that when +- the release() function is called, that will trigger a proper +- detach(). +- */ +- if (link->state & DEV_CONFIG) { +- link->state |= DEV_STALE_LINK; +- return; +- } +- +- /* Break the link with Card Services */ +- if (link->handle) +- pcmcia_deregister_client(link->handle); +- +- /* Unlink device structure, free pieces */ +- *linkp = link->next; +-#endif +- kfree(link->priv); +- kfree(link); +-} /* cs_detach */ ++ cs_release(link); ++ kfree(link->priv); ++} + + /*====================================================================== + +@@ -336,14 +232,15 @@ + + ======================================================================*/ + +-static int get_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse) ++static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple, ++ cisparse_t *parse) + { + int i = pcmcia_get_tuple_data(handle, tuple); + if (i != CS_SUCCESS) return i; + return pcmcia_parse_tuple(handle, tuple, parse); + } + +-static int first_tuple(client_handle_t handle, tuple_t *tuple, ++static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple, + cisparse_t *parse) + { + int i = pcmcia_get_first_tuple(handle, tuple); +@@ -351,7 +248,7 @@ + return get_tuple(handle, tuple, parse); + } + +-static int next_tuple(client_handle_t handle, tuple_t *tuple, ++static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, + cisparse_t *parse) + { + int i = pcmcia_get_next_tuple(handle, tuple); +@@ -359,9 +256,8 @@ + return get_tuple(handle, tuple, parse); + } + +-static void cs_config(dev_link_t *link) ++static int cs_config(struct pcmcia_device *link) + { +- client_handle_t handle; + tuple_t tuple; + cisparse_t parse; + cistpl_cftable_entry_t *cf = &parse.cftable_entry; +@@ -369,7 +265,6 @@ + int i; + u_char buf[64]; + char devname[128]; +- handle = link->handle; + dev = link->priv; + + /* +@@ -378,25 +273,21 @@ + */ + do { + tuple.DesiredTuple = CISTPL_CONFIG; +- i = pcmcia_get_first_tuple(handle, &tuple); ++ i = pcmcia_get_first_tuple(link, &tuple); + if (i != CS_SUCCESS) break; + tuple.TupleData = buf; + tuple.TupleDataMax = 64; + tuple.TupleOffset = 0; +- i = pcmcia_get_tuple_data(handle, &tuple); ++ i = pcmcia_get_tuple_data(link, &tuple); + if (i != CS_SUCCESS) break; +- i = pcmcia_parse_tuple(handle, &tuple, &parse); ++ i = pcmcia_parse_tuple(link, &tuple, &parse); + if (i != CS_SUCCESS) break; + link->conf.ConfigBase = parse.config.base; + } while (0); + if (i != CS_SUCCESS) { +- cs_error(link->handle, ParseTuple, i); +- link->state &= ~DEV_CONFIG_PENDING; +- return; ++ cs_error(link, ParseTuple, i); ++ return -ENODEV; + } +- +- /* Configure card */ +- link->state |= DEV_CONFIG; + + do { + +@@ -407,7 +298,7 @@ + tuple.DesiredTuple = CISTPL_VERS_1; + + devname[0] = 0; +- if( !first_tuple(handle, &tuple, &parse) && parse.version_1.ns > 1 ) { ++ if( !first_tuple(link, &tuple, &parse) && parse.version_1.ns > 1 ) { + strlcpy(devname,parse.version_1.str + parse.version_1.ofs[1], + sizeof(devname)); + } +@@ -418,7 +309,7 @@ + tuple.TupleOffset = 0; tuple.TupleDataMax = 255; + tuple.Attributes = 0; + tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; +- i = first_tuple(handle, &tuple, &parse); ++ i = first_tuple(link, &tuple, &parse); + while (i == CS_SUCCESS) { + if (cf->io.nwin > 0) { + link->conf.ConfigIndex = cf->index; +@@ -428,36 +319,36 @@ + NOTE("testing i/o %#x-%#x\n", + link->io.BasePort1, + link->io.BasePort1+link->io.NumPorts1-1); +- i = pcmcia_request_io(link->handle, &link->io); ++ i = pcmcia_request_io(link, &link->io); + if (i == CS_SUCCESS) goto found_port; + } +- i = next_tuple(handle, &tuple, &parse); ++ i = next_tuple(link, &tuple, &parse); + } + + found_port: + if (i != CS_SUCCESS) { +- cs_error(link->handle, RequestIO, i); ++ cs_error(link, RequestIO, i); + break; + } + + /* + * allocate an interrupt line + */ +- i = pcmcia_request_irq(link->handle, &link->irq); ++ i = pcmcia_request_irq(link, &link->irq); + if (i != CS_SUCCESS) { +- cs_error(link->handle, RequestIRQ, i); +- pcmcia_release_io(link->handle, &link->io); ++ cs_error(link, RequestIRQ, i); ++ /* undo */ ++ pcmcia_disable_device(link); + break; + } + + /* + * configure the PCMCIA socket + */ +- i = pcmcia_request_configuration(link->handle, &link->conf); ++ i = pcmcia_request_configuration(link, &link->conf); + if (i != CS_SUCCESS) { +- cs_error(link->handle, RequestConfiguration, i); +- pcmcia_release_io(link->handle, &link->io); +- pcmcia_release_irq(link->handle, &link->irq); ++ cs_error(link, RequestConfiguration, i); ++ pcmcia_disable_device(link); + break; + } + +@@ -469,14 +360,13 @@ + strcpy(dev->node.dev_name, "A1"); + dev->node.major = 64; + dev->node.minor = 0; +- link->dev = &dev->node; +- +- link->state &= ~DEV_CONFIG_PENDING; ++ ++ link->dev_node = &dev->node; + /* If any step failed, release any partially configured state */ + if (i != 0) { + ERROR("Failed to setup controller, releasing link...\n"); + cs_release(link); +- return; ++ return -ENODEV; + } + NOTE("Ready to call card driver for '%s'...\n", devname); + +@@ -488,7 +378,7 @@ + link->irq.AssignedIRQ + ); + cs_release(link); +- return; ++ return -ENODEV; + } + dev->node.minor = i; + +@@ -498,6 +388,7 @@ + link->io.BasePort1, + link->irq.AssignedIRQ + ); ++ return 0; + } /* cs_config */ + + /*====================================================================== +@@ -508,96 +399,13 @@ + + ======================================================================*/ + +-static void cs_release(dev_link_t *link) ++static void cs_release(struct pcmcia_device *link) + { + fcpcmcia_delcard(link->io.BasePort1, link->irq.AssignedIRQ); + +- /* Unlink the device chain */ +- link->dev = NULL; +- +- /* Don't bother checking to see if these succeed or not */ +- pcmcia_release_configuration(link->handle); +- pcmcia_release_io(link->handle, &link->io); +- pcmcia_release_irq(link->handle, &link->irq); +- link->state &= ~DEV_CONFIG; +- +-#ifndef NEW_PCMCIA_DRV +- if (link->state & DEV_STALE_LINK) +- cs_detach(link); +-#endif ++ pcmcia_disable_device(link); + } /* cs_release */ + +-#ifdef NEW_PCMCIA_DRV +-static int cs_suspend(struct pcmcia_device *dev) +-{ +- dev_link_t *link = dev_to_instance(dev); +- +- link->state |= DEV_SUSPEND; +- if (link->state & DEV_CONFIG) +- pcmcia_release_configuration(link->handle); +- +- return 0; +-} +- +-static int cs_resume(struct pcmcia_device *dev) +-{ +- dev_link_t *link = dev_to_instance(dev); +- +- link->state &= ~DEV_SUSPEND; +- if (link->state & DEV_CONFIG) +- pcmcia_request_configuration(link->handle, &link->conf); +- +- return 0; +-} +-#else +-/*====================================================================== +- +- The card status event handler. Mostly, this schedules other +- stuff to run after an event is received. A CARD_REMOVAL event +- also sets some flags to discourage the net drivers from trying +- to talk to the card any more. +- +- When a CARD_REMOVAL event is received, we immediately set a flag +- to block future accesses to this device. All the functions that +- actually access the device should check this flag to make sure +- the card is still present. +- +-======================================================================*/ +- +-static int cs_event(event_t event, int priority, event_callback_args_t *args) +-{ +- dev_link_t *link = args->client_data; +- +- LOG("Card service event: %x\n", event); +- switch (event) { +- case CS_EVENT_CARD_REMOVAL: +- link->state &= ~DEV_PRESENT; +- if (link->state & DEV_CONFIG) +- cs_release(link); +- break; +- case CS_EVENT_CARD_INSERTION: +- link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; +- cs_config(link); +- break; +- case CS_EVENT_PM_SUSPEND: +- link->state |= DEV_SUSPEND; +- /* Fall through... */ +- case CS_EVENT_RESET_PHYSICAL: +- if (link->state & DEV_CONFIG) +- pcmcia_release_configuration(link->handle); +- break; +- case CS_EVENT_PM_RESUME: +- link->state &= ~DEV_SUSPEND; +- /* Fall through... */ +- case CS_EVENT_CARD_RESET: +- if (link->state & DEV_CONFIG) +- pcmcia_request_configuration(link->handle, &link->conf); +- break; +- } +- return 0; +-} /* cs_event */ +-#endif +- + static struct pcmcia_device_id fcpcmcia_ids[] = { + PCMCIA_DEVICE_PROD_ID12("AVM", "ISDN A", 0x95d42008, 0xadc9d4bb), + PCMCIA_DEVICE_PROD_ID12("ISDN", "CARD", 0x8d9761c8, 0x01c5aa7b), +@@ -610,17 +418,10 @@ + .drv = { + .name = "fcpcmcia_cs", + }, +-#ifdef NEW_PCMCIA_DRV +- .probe = cs_attach, +- .remove = cs_detach, +- .suspend= cs_suspend, +- .resume = cs_resume, +-#else +- .attach = cs_attach, +- .detach = cs_detach, +- .event = cs_event, +-#endif +- .id_table = fcpcmcia_ids, ++ .probe = cs_probe, ++ .remove = cs_detach, ++ .id_table = fcpcmcia_ids, ++ + }; + + static int __init cs_init(void) +@@ -631,6 +432,7 @@ + static void __exit cs_exit(void) + { + pcmcia_unregister_driver(&cs_driver); ++ + } + + module_init(cs_init); +diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c +--- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c 2005-07-07 00:00:00.000000000 +0200 ++++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c 2007-01-25 11:39:11.000000000 +0100 +@@ -22,7 +22,6 @@ + + #include + #include +-#include + #include + #include + #include diff --git a/net-dialup/fritzcapi/files/2.6.43-linux-2.6.19-irq_handler.amd64.patch b/net-dialup/fritzcapi/files/2.6.43-linux-2.6.19-irq_handler.amd64.patch new file mode 100644 index 000000000000..bec428318a0d --- /dev/null +++ b/net-dialup/fritzcapi/files/2.6.43-linux-2.6.19-irq_handler.amd64.patch @@ -0,0 +1,78 @@ +irq_handler_t has changed type in 2.6.19 due to commit +7d12e780e003f93433d49ce78cfedf4b4c52adc5 by David Howells, +for details see git diff at http://tinyurl.com/2xpdy7 + +As the third argument was never used by the drivers, I simply wrapped every +occurrence of it in a condition for kernel version prior to 2.6.19. +2007-01-13 Martin von Gagern + +diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c +--- usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c 2007-01-22 23:36:39.000000000 +0100 ++++ usr/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c 2007-01-23 00:07:18.000000000 +0100 +@@ -107,7 +107,11 @@ + /*---------------------------------------------------------------------------*\ + \*---------------------------------------------------------------------------*/ + static void scheduler (unsigned long data); +-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs); ++static irqreturn_t irq_handler (int irq, void * args ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) ++ , struct pt_regs * regs ++#endif ++ ); + + static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0); + +@@ -836,11 +840,17 @@ + + /*---------------------------------------------------------------------------*\ + \*---------------------------------------------------------------------------*/ +-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) { ++static irqreturn_t irq_handler (int irq, void * args ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) ++ , struct pt_regs * regs ++#endif ++ ) { + int res = IRQ_NONE; + + UNUSED_ARG (irq); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) + UNUSED_ARG (regs); ++#endif + if (args != NULL) { + assert (capi_lib->cm_handle_events != NULL); + if (atomic_read (&scheduler_id) == smp_processor_id ()) { +diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c +--- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c 2007-01-22 23:36:39.000000000 +0100 ++++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c 2007-01-23 00:07:18.000000000 +0100 +@@ -107,7 +107,11 @@ + /*---------------------------------------------------------------------------*\ + \*---------------------------------------------------------------------------*/ + static void scheduler (unsigned long data); +-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs); ++static irqreturn_t irq_handler (int irq, void * args ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) ++ , struct pt_regs * regs ++#endif ++ ); + + static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0); + +@@ -836,11 +840,17 @@ + + /*---------------------------------------------------------------------------*\ + \*---------------------------------------------------------------------------*/ +-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) { ++static irqreturn_t irq_handler (int irq, void * args ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) ++ , struct pt_regs * regs ++#endif ++ ) { + int res = IRQ_NONE; + + UNUSED_ARG (irq); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) + UNUSED_ARG (regs); ++#endif + if (args != NULL) { + assert (capi_lib->cm_handle_events != NULL); + if (atomic_read (&scheduler_id) == smp_processor_id ()) { diff --git a/net-dialup/fritzcapi/files/fritzcapi-2.6.20.amd64.patch b/net-dialup/fritzcapi/files/fritzcapi-2.6.20.amd64.patch new file mode 100644 index 000000000000..14508988b825 --- /dev/null +++ b/net-dialup/fritzcapi/files/fritzcapi-2.6.20.amd64.patch @@ -0,0 +1,12 @@ +diff -urN usr.orig/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c +--- usr.orig/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c 2007-02-06 00:41:17.000000000 +0100 ++++ usr/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c 2007-02-06 00:46:06.000000000 +0100 +@@ -789,7 +789,7 @@ + close_func = func; + close_data = data; + +- INIT_WORK (&closing_work, closing_worker, capi_card); ++ INIT_WORK (&closing_work, closing_worker); + schedule_work (&closing_work); + LOG("Worker scheduled.\n"); + } /* start_closing_worker */ diff --git a/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild index 7acab9d8b682..72b1ae5dc3e5 100644 --- a/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild +++ b/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild,v 1.11 2007/05/02 07:53:25 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild,v 1.12 2007/06/27 21:34:59 genstef Exp $ inherit linux-mod rpm eutils @@ -108,12 +108,18 @@ src_unpack() { sed -i "s:\$(PWD)/../lib/driver-lib.o:${S}/e2220pc/lib/driver-lib.o:" ${i} convert_to_m ${i} done - if [ -e fritz.usb2 ]; then + if [ -e fritz.usb2 ]; then cd fritz.usb2; epatch ${FILESDIR}/fcusb2-2.6.19.patch; cd .. fi - epatch ${FILESDIR}/2.6.43-linux-2.6.19-irq_handler.patch - kernel_is ge 2 6 17 && epatch ${FILESDIR}/2.6.43-fcpcmcia.patch - #kernel_is ge 2 6 20 && epatch ${FILESDIR}/fritzcapi-2.6.20.patch + if ! use amd64; then + epatch ${FILESDIR}/2.6.43-linux-2.6.19-irq_handler.patch + kernel_is ge 2 6 17 && epatch ${FILESDIR}/2.6.43-fcpcmcia.patch + kernel_is ge 2 6 20 && epatch ${FILESDIR}/fritzcapi-2.6.20.patch + else + epatch ${FILESDIR}/2.6.43-linux-2.6.19-irq_handler.amd64.patch + kernel_is ge 2 6 17 && epatch ${FILESDIR}/2.6.43-fcpcmcia.amd64.patch + kernel_is ge 2 6 20 && epatch ${FILESDIR}/fritzcapi-2.6.20.amd64.patch + fi find -name \*.[hc] -print0 | xargs -0 sed -i ' s:#include :#include :; s/driver_init/fc_driver_init/g; s/driver_exit/fc_driver_exit/;' -- cgit v1.2.3-65-gdbad