aboutsummaryrefslogtreecommitdiffstats
path: root/package/acx/patches
diff options
context:
space:
mode:
authorMatteo Croce <rootkit85@yahoo.it>2007-10-03 17:30:27 +0000
committerMatteo Croce <rootkit85@yahoo.it>2007-10-03 17:30:27 +0000
commitf1593e5c2845f861d537d227808b12253be6caa2 (patch)
tree4088974ecb80ae0625fe15ab361d0c65197fd856 /package/acx/patches
parentd2f329226693344a07d8544d206f52073b4f267f (diff)
downloadupstream-f1593e5c2845f861d537d227808b12253be6caa2.tar.gz
upstream-f1593e5c2845f861d537d227808b12253be6caa2.tar.bz2
upstream-f1593e5c2845f861d537d227808b12253be6caa2.zip
upgrade acx and acx-mac80211, removed two patches now unneeded
SVN-Revision: 9112
Diffstat (limited to 'package/acx/patches')
-rw-r--r--package/acx/patches/003-endianness-fixes.patch113
-rw-r--r--package/acx/patches/011-no_pm.patch33
2 files changed, 0 insertions, 146 deletions
diff --git a/package/acx/patches/003-endianness-fixes.patch b/package/acx/patches/003-endianness-fixes.patch
deleted file mode 100644
index d4262852b1..0000000000
--- a/package/acx/patches/003-endianness-fixes.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Index: acx-20070101/pci.c
-===================================================================
---- acx-20070101.orig/pci.c 2007-06-04 13:22:42.557385576 +0200
-+++ acx-20070101/pci.c 2007-06-04 13:22:42.946326448 +0200
-@@ -123,6 +123,11 @@
- ** Register access
- */
-
-+#define acx_readl(v) le32_to_cpu(readl((v)))
-+#define acx_readw(v) le16_to_cpu(readw((v)))
-+#define acx_writew(v,r) writew(le16_to_cpu((v)), r)
-+#define acx_writel(v,r) writel(le32_to_cpu((v)), r)
-+
- /* Pick one */
- /* #define INLINE_IO static */
- #define INLINE_IO static inline
-@@ -131,17 +136,17 @@
- read_reg32(acx_device_t *adev, unsigned int offset)
- {
- #if ACX_IO_WIDTH == 32
-- return readl((u8 *)adev->iobase + adev->io[offset]);
-+ return acx_readl((u8 *)adev->iobase + adev->io[offset]);
- #else
-- return readw((u8 *)adev->iobase + adev->io[offset])
-- + (readw((u8 *)adev->iobase + adev->io[offset] + 2) << 16);
-+ return acx_readw((u8 *)adev->iobase + adev->io[offset])
-+ + (acx_readw((u8 *)adev->iobase + adev->io[offset] + 2) << 16);
- #endif
- }
-
- INLINE_IO u16
- read_reg16(acx_device_t *adev, unsigned int offset)
- {
-- return readw((u8 *)adev->iobase + adev->io[offset]);
-+ return acx_readw((u8 *)adev->iobase + adev->io[offset]);
- }
-
- INLINE_IO u8
-@@ -154,17 +159,17 @@
- write_reg32(acx_device_t *adev, unsigned int offset, u32 val)
- {
- #if ACX_IO_WIDTH == 32
-- writel(val, (u8 *)adev->iobase + adev->io[offset]);
-+ acx_writel(val, (u8 *)adev->iobase + adev->io[offset]);
- #else
-- writew(val & 0xffff, (u8 *)adev->iobase + adev->io[offset]);
-- writew(val >> 16, (u8 *)adev->iobase + adev->io[offset] + 2);
-+ acx_writew(val & 0xffff, (u8 *)adev->iobase + adev->io[offset]);
-+ acx_writew(val >> 16, (u8 *)adev->iobase + adev->io[offset] + 2);
- #endif
- }
-
- INLINE_IO void
- write_reg16(acx_device_t *adev, unsigned int offset, u16 val)
- {
-- writew(val, (u8 *)adev->iobase + adev->io[offset]);
-+ acx_writew(val, (u8 *)adev->iobase + adev->io[offset]);
- }
-
- INLINE_IO void
-@@ -192,7 +197,7 @@
- {
- /* fast version (accesses the first register, IO_ACX_SOFT_RESET,
- * which should be safe): */
-- return readl(adev->iobase) != 0xffffffff;
-+ return acx_readl(adev->iobase) != 0xffffffff;
- }
-
-
-@@ -835,7 +840,7 @@
- static inline void
- acxpci_write_cmd_type_status(acx_device_t *adev, u16 type, u16 status)
- {
-- writel(type | (status << 16), adev->cmd_area);
-+ acx_writel(type | (status << 16), adev->cmd_area);
- write_flush(adev);
- }
-
-@@ -848,7 +853,7 @@
- {
- u32 cmd_type, cmd_status;
-
-- cmd_type = readl(adev->cmd_area);
-+ cmd_type = acx_readl(adev->cmd_area);
- cmd_status = (cmd_type >> 16);
- cmd_type = (u16)cmd_type;
-
-@@ -2415,12 +2420,12 @@
- #endif
- u32 info_type, info_status;
-
-- info_type = readl(adev->info_area);
-+ info_type = acx_readl(adev->info_area);
- info_status = (info_type >> 16);
- info_type = (u16)info_type;
-
- /* inform fw that we have read this info message */
-- writel(info_type | 0x00010000, adev->info_area);
-+ acx_writel(info_type | 0x00010000, adev->info_area);
- write_reg16(adev, IO_ACX_INT_TRIG, INT_TRIG_INFOACK);
- write_flush(adev);
-
-@@ -4209,8 +4214,8 @@
- #define ENDIANNESS_STRING "running on a BIG-ENDIAN CPU\n"
- #endif
- log(L_INIT,
-- ENDIANNESS_STRING
-- "PCI module " ACX_RELEASE " initialized, "
-+ "acx: " ENDIANNESS_STRING
-+ "acx: PCI module " ACX_RELEASE " initialized, "
- "waiting for cards to probe...\n"
- );
-
diff --git a/package/acx/patches/011-no_pm.patch b/package/acx/patches/011-no_pm.patch
deleted file mode 100644
index d1d0feb2f8..0000000000
--- a/package/acx/patches/011-no_pm.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ruN acx-20070610-old/pci.c acx-20070610-new/pci.c
---- acx-20070610-old/pci.c 2007-09-16 17:57:55.000000000 +0200
-+++ acx-20070610-new/pci.c 2007-09-16 17:59:25.000000000 +0200
-@@ -1630,7 +1630,9 @@
- log(L_IRQ|L_INIT, "using IRQ %d\n", pdev->irq);
-
- /* need to be able to restore PCI state after a suspend */
-+#ifdef CONFIG_PM
- pci_save_state(pdev);
-+#endif
- pci_set_drvdata(pdev, ndev);
-
- /* ok, pci setup is finished, now start initializing the card */
-@@ -1728,7 +1730,9 @@
- pci_disable_device(pdev);
- fail_pci_enable_device:
-
-+#ifdef CONFIG_PM
- pci_set_power_state(pdev, PCI_D3hot);
-+#endif
-
- done:
- FN_EXIT1(result);
-@@ -1848,7 +1852,9 @@
- free_netdev(ndev);
-
- /* put device into ACPI D3 mode (shutdown) */
-+#ifdef CONFIG_PM
- pci_set_power_state(pdev, PCI_D3hot);
-+#endif
-
- end:
- FN_EXIT0;