summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/sf/if_sf.c4
-rw-r--r--sys/dev/vr/if_vr.c18
-rw-r--r--sys/pci/if_rl.c4
-rw-r--r--sys/pci/if_sf.c4
-rw-r--r--sys/pci/if_vr.c18
-rw-r--r--sys/pci/if_wb.c10
-rw-r--r--sys/pci/if_xl.c4
7 files changed, 31 insertions, 31 deletions
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index f5df991..69e7c1a 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -211,10 +211,10 @@ DRIVER_MODULE(if_sf, pci, sf_driver, sf_devclass, 0, 0);
DRIVER_MODULE(miibus, sf, miibus_driver, miibus_devclass, 0, 0);
#define SF_SETBIT(sc, reg, x) \
- csr_write_4(sc, reg, csr_read_4(sc, reg) | x)
+ csr_write_4(sc, reg, csr_read_4(sc, reg) | (x))
#define SF_CLRBIT(sc, reg, x) \
- csr_write_4(sc, reg, csr_read_4(sc, reg) & ~x)
+ csr_write_4(sc, reg, csr_read_4(sc, reg) & ~(x))
static u_int32_t
csr_read_4(sc, reg)
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index f96e0e2..93fdae7 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -201,35 +201,35 @@ DRIVER_MODULE(miibus, vr, miibus_driver, miibus_devclass, 0, 0);
#define VR_SETBIT(sc, reg, x) \
CSR_WRITE_1(sc, reg, \
- CSR_READ_1(sc, reg) | x)
+ CSR_READ_1(sc, reg) | (x))
#define VR_CLRBIT(sc, reg, x) \
CSR_WRITE_1(sc, reg, \
- CSR_READ_1(sc, reg) & ~x)
+ CSR_READ_1(sc, reg) & ~(x))
#define VR_SETBIT16(sc, reg, x) \
CSR_WRITE_2(sc, reg, \
- CSR_READ_2(sc, reg) | x)
+ CSR_READ_2(sc, reg) | (x))
#define VR_CLRBIT16(sc, reg, x) \
CSR_WRITE_2(sc, reg, \
- CSR_READ_2(sc, reg) & ~x)
+ CSR_READ_2(sc, reg) & ~(x))
#define VR_SETBIT32(sc, reg, x) \
CSR_WRITE_4(sc, reg, \
- CSR_READ_4(sc, reg) | x)
+ CSR_READ_4(sc, reg) | (x))
#define VR_CLRBIT32(sc, reg, x) \
CSR_WRITE_4(sc, reg, \
- CSR_READ_4(sc, reg) & ~x)
+ CSR_READ_4(sc, reg) & ~(x))
#define SIO_SET(x) \
CSR_WRITE_1(sc, VR_MIICMD, \
- CSR_READ_1(sc, VR_MIICMD) | x)
+ CSR_READ_1(sc, VR_MIICMD) | (x))
#define SIO_CLR(x) \
CSR_WRITE_1(sc, VR_MIICMD, \
- CSR_READ_1(sc, VR_MIICMD) & ~x)
+ CSR_READ_1(sc, VR_MIICMD) & ~(x))
/*
* Sync the PHYs by setting data bit and strobing the clock 32 times.
@@ -1062,7 +1062,7 @@ vr_rxeof(sc)
return;
}
-void
+static void
vr_rxeoc(sc)
struct vr_softc *sc;
{
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 152aa3b..737aaea 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -387,11 +387,11 @@ rl_read_eeprom(sc, dest, off, cnt, swap)
*/
#define MII_SET(x) \
CSR_WRITE_1(sc, RL_MII, \
- CSR_READ_1(sc, RL_MII) | x)
+ CSR_READ_1(sc, RL_MII) | (x))
#define MII_CLR(x) \
CSR_WRITE_1(sc, RL_MII, \
- CSR_READ_1(sc, RL_MII) & ~x)
+ CSR_READ_1(sc, RL_MII) & ~(x))
/*
* Sync the PHYs by setting data bit and strobing the clock 32 times.
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index f5df991..69e7c1a 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -211,10 +211,10 @@ DRIVER_MODULE(if_sf, pci, sf_driver, sf_devclass, 0, 0);
DRIVER_MODULE(miibus, sf, miibus_driver, miibus_devclass, 0, 0);
#define SF_SETBIT(sc, reg, x) \
- csr_write_4(sc, reg, csr_read_4(sc, reg) | x)
+ csr_write_4(sc, reg, csr_read_4(sc, reg) | (x))
#define SF_CLRBIT(sc, reg, x) \
- csr_write_4(sc, reg, csr_read_4(sc, reg) & ~x)
+ csr_write_4(sc, reg, csr_read_4(sc, reg) & ~(x))
static u_int32_t
csr_read_4(sc, reg)
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index f96e0e2..93fdae7 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -201,35 +201,35 @@ DRIVER_MODULE(miibus, vr, miibus_driver, miibus_devclass, 0, 0);
#define VR_SETBIT(sc, reg, x) \
CSR_WRITE_1(sc, reg, \
- CSR_READ_1(sc, reg) | x)
+ CSR_READ_1(sc, reg) | (x))
#define VR_CLRBIT(sc, reg, x) \
CSR_WRITE_1(sc, reg, \
- CSR_READ_1(sc, reg) & ~x)
+ CSR_READ_1(sc, reg) & ~(x))
#define VR_SETBIT16(sc, reg, x) \
CSR_WRITE_2(sc, reg, \
- CSR_READ_2(sc, reg) | x)
+ CSR_READ_2(sc, reg) | (x))
#define VR_CLRBIT16(sc, reg, x) \
CSR_WRITE_2(sc, reg, \
- CSR_READ_2(sc, reg) & ~x)
+ CSR_READ_2(sc, reg) & ~(x))
#define VR_SETBIT32(sc, reg, x) \
CSR_WRITE_4(sc, reg, \
- CSR_READ_4(sc, reg) | x)
+ CSR_READ_4(sc, reg) | (x))
#define VR_CLRBIT32(sc, reg, x) \
CSR_WRITE_4(sc, reg, \
- CSR_READ_4(sc, reg) & ~x)
+ CSR_READ_4(sc, reg) & ~(x))
#define SIO_SET(x) \
CSR_WRITE_1(sc, VR_MIICMD, \
- CSR_READ_1(sc, VR_MIICMD) | x)
+ CSR_READ_1(sc, VR_MIICMD) | (x))
#define SIO_CLR(x) \
CSR_WRITE_1(sc, VR_MIICMD, \
- CSR_READ_1(sc, VR_MIICMD) & ~x)
+ CSR_READ_1(sc, VR_MIICMD) & ~(x))
/*
* Sync the PHYs by setting data bit and strobing the clock 32 times.
@@ -1062,7 +1062,7 @@ vr_rxeof(sc)
return;
}
-void
+static void
vr_rxeoc(sc)
struct vr_softc *sc;
{
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index e17b9aa..9e5e330 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -227,19 +227,19 @@ DRIVER_MODULE(miibus, wb, miibus_driver, miibus_devclass, 0, 0);
#define WB_SETBIT(sc, reg, x) \
CSR_WRITE_4(sc, reg, \
- CSR_READ_4(sc, reg) | x)
+ CSR_READ_4(sc, reg) | (x))
#define WB_CLRBIT(sc, reg, x) \
CSR_WRITE_4(sc, reg, \
- CSR_READ_4(sc, reg) & ~x)
+ CSR_READ_4(sc, reg) & ~(x))
#define SIO_SET(x) \
CSR_WRITE_4(sc, WB_SIO, \
- CSR_READ_4(sc, WB_SIO) | x)
+ CSR_READ_4(sc, WB_SIO) | (x))
#define SIO_CLR(x) \
CSR_WRITE_4(sc, WB_SIO, \
- CSR_READ_4(sc, WB_SIO) & ~x)
+ CSR_READ_4(sc, WB_SIO) & ~(x))
/*
* Send a read command and address to the EEPROM, check for ACK.
@@ -1212,7 +1212,7 @@ wb_rxeof(sc)
}
}
-void
+static void
wb_rxeoc(sc)
struct wb_softc *sc;
{
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index f4137d6..20921e9 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -350,11 +350,11 @@ xl_wait(sc)
*/
#define MII_SET(x) \
CSR_WRITE_2(sc, XL_W4_PHY_MGMT, \
- CSR_READ_2(sc, XL_W4_PHY_MGMT) | x)
+ CSR_READ_2(sc, XL_W4_PHY_MGMT) | (x))
#define MII_CLR(x) \
CSR_WRITE_2(sc, XL_W4_PHY_MGMT, \
- CSR_READ_2(sc, XL_W4_PHY_MGMT) & ~x)
+ CSR_READ_2(sc, XL_W4_PHY_MGMT) & ~(x))
/*
* Sync the PHYs by setting data bit and strobing the clock 32 times.
OpenPOWER on IntegriCloud