Use the correct register name. s/PCI_COMMAND_STATUS_REG/PCIR_COMMAND/

10 files changed, 30 insertions, 30 deletions

diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 0f04368..a8e0ba0 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -822,10 +822,10 @@ static int rl_attach(dev)
 	/*
 	 * Map control/status registers.
 	 */
-	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+	command = pci_read_config(dev, PCIR_COMMAND, 4);
 	command |= (PCIM_CMD_PORTEN|PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN);
-	pci_write_config(dev, PCI_COMMAND_STATUS_REG, command, 4);
-	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+	pci_write_config(dev, PCIR_COMMAND, command, 4);
+	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef RL_USEIOSPACE
 	if (!(command & PCIM_CMD_PORTEN)) {
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index 19432dc..2ce3869 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -713,10 +713,10 @@ static int sf_attach(dev)
 	/*
 	 * Map control/status registers.
 	 */
-	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+	command = pci_read_config(dev, PCIR_COMMAND, 4);
 	command |= (PCIM_CMD_PORTEN|PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN);
-	pci_write_config(dev, PCI_COMMAND_STATUS_REG, command, 4);
-	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+	pci_write_config(dev, PCIR_COMMAND, command, 4);
+	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef SF_USEIOSPACE
 	if (!(command & PCIM_CMD_PORTEN)) {
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index 016edfa..b954433 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -585,10 +585,10 @@ static int sis_attach(dev)
 	/*
 	 * Map control/status registers.
 	 */
-	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+	command = pci_read_config(dev, PCIR_COMMAND, 4);
 	command |= (PCIM_CMD_PORTEN|PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN);
-	pci_write_config(dev, PCI_COMMAND_STATUS_REG, command, 4);
-	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+	pci_write_config(dev, PCIR_COMMAND, command, 4);
+	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef SIS_USEIOSPACE
 	if (!(command & PCIM_CMD_PORTEN)) {
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index 4246b2a..09907f8 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -1280,10 +1280,10 @@ static int sk_attach(dev)
 	/*
 	 * Map control/status registers.
 	 */
-	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+	command = pci_read_config(dev, PCIR_COMMAND, 4);
 	command |= (PCIM_CMD_PORTEN|PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN);
-	pci_write_config(dev, PCI_COMMAND_STATUS_REG, command, 4);
-	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+	pci_write_config(dev, PCIR_COMMAND, command, 4);
+	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef SK_USEIOSPACE
 	if (!(command & PCIM_CMD_PORTEN)) {
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index 033324c..8a2f1dd 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -946,10 +946,10 @@ static int ste_attach(dev)
 	/*
 	 * Map control/status registers.
 	 */
-	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+	command = pci_read_config(dev, PCIR_COMMAND, 4);
 	command |= (PCIM_CMD_PORTEN|PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN);
-	pci_write_config(dev, PCI_COMMAND_STATUS_REG, command, 4);
-	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+	pci_write_config(dev, PCIR_COMMAND, command, 4);
+	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef STE_USEIOSPACE
 	if (!(command & PCIM_CMD_PORTEN)) {
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index fe4c861..54d7a86 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -1544,10 +1544,10 @@ static int ti_attach(dev)
 	/*
 	 * Map control/status registers.
 	 */
-	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+	command = pci_read_config(dev, PCIR_COMMAND, 4);
 	command |= (PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN);
-	pci_write_config(dev, PCI_COMMAND_STATUS_REG, command, 4);
-	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+	pci_write_config(dev, PCIR_COMMAND, command, 4);
+	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 	if (!(command & PCIM_CMD_MEMEN)) {
 		printf("ti%d: failed to enable memory mapping!\n", unit);
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index c724fcd..4f14915 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -1136,10 +1136,10 @@ static int tl_attach(dev)
 	/*
 	 * Map control/status registers.
 	 */
-	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+	command = pci_read_config(dev, PCIR_COMMAND, 4);
 	command |= (PCIM_CMD_PORTEN|PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN);
-	pci_write_config(dev, PCI_COMMAND_STATUS_REG, command, 4);
-	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+	pci_write_config(dev, PCIR_COMMAND, command, 4);
+	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef TL_USEIOSPACE
 	if (!(command & PCIM_CMD_PORTEN)) {
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index c28c207..05ce14c 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -676,10 +676,10 @@ static int vr_attach(dev)
 	/*
 	 * Map control/status registers.
 	 */
-	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+	command = pci_read_config(dev, PCIR_COMMAND, 4);
 	command |= (PCIM_CMD_PORTEN|PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN);
-	pci_write_config(dev, PCI_COMMAND_STATUS_REG, command, 4);
-	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+	pci_write_config(dev, PCIR_COMMAND, command, 4);
+	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef VR_USEIOSPACE
 	if (!(command & PCIM_CMD_PORTEN)) {
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index 78d0c0a..2f8b60a 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -852,10 +852,10 @@ static int wb_attach(dev)
 	/*
 	 * Map control/status registers.
 	 */
-	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+	command = pci_read_config(dev, PCIR_COMMAND, 4);
 	command |= (PCIM_CMD_PORTEN|PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN);
-	pci_write_config(dev, PCI_COMMAND_STATUS_REG, command, 4);
-	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+	pci_write_config(dev, PCIR_COMMAND, command, 4);
+	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef WB_USEIOSPACE
 	if (!(command & PCIM_CMD_PORTEN)) {
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index 8e4d41c..edfb4ee 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -1232,10 +1232,10 @@ static int xl_attach(dev)
 	/*
 	 * Map control/status registers.
 	 */
-	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+	command = pci_read_config(dev, PCIR_COMMAND, 4);
 	command |= (PCIM_CMD_PORTEN|PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN);
-	pci_write_config(dev, PCI_COMMAND_STATUS_REG, command, 4);
-	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+	pci_write_config(dev, PCIR_COMMAND, command, 4);
+	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef XL_USEIOSPACE
 	if (!(command & PCIM_CMD_PORTEN)) {