Changeset 5828554 in mainline for uspace/drv/bus/pci/pciintel/pci.c

Timestamp:

2014-01-19T14:37:22Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/drv/bus/pci/pciintel/pci.c (modified) (7 diffs)

uspace/drv/bus/pci/pciintel/pci.c

@@ -153 +153 @@
 
 
-static int pci_config_space_write_32(ddf_fun_t *fun, uint32_t address,
+static int config_space_write_32(ddf_fun_t *fun, uint32_t address,
     uint32_t data)
 {
@@ -162 +162 @@
 }
 
-static int pci_config_space_write_16(
+static int config_space_write_16(
     ddf_fun_t *fun, uint32_t address, uint16_t data)
 {
@@ -171 +171 @@
 }
 
-static int pci_config_space_write_8(
+static int config_space_write_8(
     ddf_fun_t *fun, uint32_t address, uint8_t data)
 {
@@ -180 +180 @@
 }
 
-static int pci_config_space_read_32(
+static int config_space_read_32(
     ddf_fun_t *fun, uint32_t address, uint32_t *data)
 {
@@ -189 +189 @@
 }
 
-static int pci_config_space_read_16(
+static int config_space_read_16(
     ddf_fun_t *fun, uint32_t address, uint16_t *data)
 {
@@ -198 +198 @@
 }
 
-static int pci_config_space_read_8(
+static int config_space_read_8(
     ddf_fun_t *fun, uint32_t address, uint8_t *data)
 {
@@ -217 +217 @@
 
 static pci_dev_iface_t pci_dev_ops = {
-        .config_space_read_8 = &pci_config_space_read_8,
-        .config_space_read_16 = &pci_config_space_read_16,
-        .config_space_read_32 = &pci_config_space_read_32,
-        .config_space_write_8 = &pci_config_space_write_8,
-        .config_space_write_16 = &pci_config_space_write_16,
-        .config_space_write_32 = &pci_config_space_write_32
+        .config_space_read_8 = &config_space_read_8,
+        .config_space_read_16 = &config_space_read_16,
+        .config_space_read_32 = &config_space_read_32,
+        .config_space_write_8 = &config_space_write_8,
+        .config_space_write_16 = &config_space_write_16,
+        .config_space_write_32 = &config_space_write_32
 };