1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
diff -Nur -x '*.o' -x '*.ko' acx-20070101/pci.c acx-20070101.big/pci.c
--- acx-20070101/pci.c 2007-06-02 17:29:53.000000000 +0200
+++ acx-20070101.big/pci.c 2007-06-02 17:23:37.000000000 +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"
);
|
