diff options
| -rw-r--r-- | net-wireless/orinoco/ChangeLog | 6 | ||||
| -rw-r--r-- | net-wireless/orinoco/Manifest | 3 | ||||
| -rw-r--r-- | net-wireless/orinoco/files/orinoco-0.15rc2-2.6.10.patch | 73 | ||||
| -rw-r--r-- | net-wireless/orinoco/orinoco-0.15_rc2-r1.ebuild | 7 |
4 files changed, 85 insertions, 4 deletions
diff --git a/net-wireless/orinoco/ChangeLog b/net-wireless/orinoco/ChangeLog index cfd61937f4b6..f4bc822a10de 100644 --- a/net-wireless/orinoco/ChangeLog +++ b/net-wireless/orinoco/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-wireless/orinoco # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/orinoco/ChangeLog,v 1.3 2005/01/04 10:05:58 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/orinoco/ChangeLog,v 1.4 2005/01/07 14:14:21 brix Exp $ + + 07 Jan 2005; Henrik Brix Andersen <brix@gentoo.org> + +files/orinoco-0.15rc2-2.6.10.patch, orinoco-0.15_rc2-r1.ebuild: + Allow compiling against kernel 2.6.10, fixes bug #76979. 04 Jan 2005; Henrik Brix Andersen <brix@gentoo.org> orinoco-0.15_rc2-r1.ebuild: diff --git a/net-wireless/orinoco/Manifest b/net-wireless/orinoco/Manifest index fec9e5481b6c..d28ab2ab8d2c 100644 --- a/net-wireless/orinoco/Manifest +++ b/net-wireless/orinoco/Manifest @@ -1,6 +1,7 @@ MD5 4d8904a877aca8303a6fc2492646d296 orinoco-0.15_rc2.ebuild 2290 MD5 dfb53c23c37fcbbe03d9b7e8077f6c6a ChangeLog 703 -MD5 9195ab0afd6fd683456ebaf84594bd14 orinoco-0.15_rc2-r1.ebuild 1611 +MD5 e7b6543c8e188f11c9dbfb1de34662d7 orinoco-0.15_rc2-r1.ebuild 1562 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255 MD5 85bf652db8f2f4e7c10d071cbeb13aa4 files/digest-orinoco-0.15_rc2-r1 436 +MD5 26ab41e4c9fbbdbf80de660b20e9f233 files/orinoco-0.15rc2-2.6.10.patch 2755 MD5 85bf652db8f2f4e7c10d071cbeb13aa4 files/digest-orinoco-0.15_rc2 436 diff --git a/net-wireless/orinoco/files/orinoco-0.15rc2-2.6.10.patch b/net-wireless/orinoco/files/orinoco-0.15rc2-2.6.10.patch new file mode 100644 index 000000000000..783afebff283 --- /dev/null +++ b/net-wireless/orinoco/files/orinoco-0.15rc2-2.6.10.patch @@ -0,0 +1,73 @@ +diff -urp orinoco-0.15rc2/hermes.h orinoco-0.15rc2-2.6.10/hermes.h +--- orinoco-0.15rc2/hermes.h 2004-07-28 08:06:45.000000000 +0200 ++++ orinoco-0.15rc2-2.6.10/hermes.h 2005-01-07 15:02:07.000000000 +0100 +@@ -366,12 +366,12 @@ typedef struct hermes { + /* Register access convenience macros */ + #define hermes_read_reg(hw, off) ((hw)->io_space ? \ + inw((hw)->iobase + ( (off) << (hw)->reg_spacing )) : \ +- readw((hw)->iobase + ( (off) << (hw)->reg_spacing ))) ++ readw((void *)(hw)->iobase + ( (off) << (hw)->reg_spacing ))) + #define hermes_write_reg(hw, off, val) do { \ + if ((hw)->io_space) \ + outw_p((val), (hw)->iobase + ((off) << (hw)->reg_spacing)); \ + else \ +- writew((val), (hw)->iobase + ((off) << (hw)->reg_spacing)); \ ++ writew((val), (void *)(hw)->iobase + ((off) << (hw)->reg_spacing)); \ + } while (0) + #define hermes_read_regn(hw, name) hermes_read_reg((hw), HERMES_##name) + #define hermes_write_regn(hw, name, val) hermes_write_reg((hw), HERMES_##name, (val)) +@@ -444,7 +444,7 @@ static inline void hermes_read_words(str + * gcc is smart enough to fold away the two swaps on + * big-endian platforms. */ + for (i = 0, p = buf; i < count; i++) { +- *p++ = cpu_to_le16(readw(hw->iobase + off)); ++ *p++ = cpu_to_le16(readw((void *)(hw->iobase + off))); + } + } + } +@@ -464,7 +464,7 @@ static inline void hermes_write_words(st + * hope gcc is smart enough to fold away the two swaps + * on big-endian platforms. */ + for (i = 0, p = buf; i < count; i++) { +- writew(le16_to_cpu(*p++), hw->iobase + off); ++ writew(le16_to_cpu(*p++), (void *)(hw->iobase + off)); + } + } + } +@@ -480,7 +480,7 @@ static inline void hermes_clear_words(st + outw(0, hw->iobase + off); + } else { + for (i = 0; i < count; i++) +- writew(0, hw->iobase + off); ++ writew(0, (void *)(hw->iobase + off)); + } + } + +diff -urp orinoco-0.15rc2/orinoco_pci.c orinoco-0.15rc2-2.6.10/orinoco_pci.c +--- orinoco-0.15rc2/orinoco_pci.c 2004-07-28 08:06:45.000000000 +0200 ++++ orinoco-0.15rc2-2.6.10/orinoco_pci.c 2005-01-07 15:08:40.902021640 +0100 +@@ -327,7 +327,11 @@ static int orinoco_pci_suspend(struct pc + + orinoco_unlock(priv, &flags); + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) + pci_save_state(pdev, card->pci_state); ++#else ++ pci_save_state(pdev); ++#endif + pci_set_power_state(pdev, 3); + + return 0; +@@ -344,8 +348,11 @@ static int orinoco_pci_resume(struct pci + printk(KERN_DEBUG "%s: Orinoco-PCI waking up\n", dev->name); + + pci_set_power_state(pdev, 0); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) + pci_restore_state(pdev, card->pci_state); +- ++#else ++ pci_restore_state(pdev); ++#endif + err = orinoco_reinit_firmware(dev); + if (err) { + printk(KERN_ERR "%s: Error %d re-initializing firmware on orinoco_pci_resume()\n", diff --git a/net-wireless/orinoco/orinoco-0.15_rc2-r1.ebuild b/net-wireless/orinoco/orinoco-0.15_rc2-r1.ebuild index 01a9ab9645ef..c100f2bb8f57 100644 --- a/net-wireless/orinoco/orinoco-0.15_rc2-r1.ebuild +++ b/net-wireless/orinoco/orinoco-0.15_rc2-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/orinoco/orinoco-0.15_rc2-r1.ebuild,v 1.2 2005/01/04 10:05:58 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/orinoco/orinoco-0.15_rc2-r1.ebuild,v 1.3 2005/01/07 14:14:21 brix Exp $ -inherit pcmcia linux-mod +inherit pcmcia linux-mod eutils MY_P=${P/_/} S=${WORKDIR}/${MY_P} @@ -46,6 +46,9 @@ src_unpack() { pcmcia_src_unpack + cd ${S} + epatch ${FILESDIR}/${MY_P}-2.6.10.patch + if [ -n "${PCMCIA_VERSION}" ]; then sed -i "s:^\(PCMCIA_CS\) =.*:\1 = ${PCMCIA_SOURCE_DIR}:" \ ${S}/Makefile |