Changeset 1b973dc in mainline for uspace/drv/bus

Timestamp:

2013-12-31T21:41:45Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1bb9833

Parents:

4c14b88 (diff), 8a84484 (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 libdrv cleanup

Location:

uspace/drv/bus

Files:

• pci/pciintel/pci.c (modified) (7 diffs)
• usb/ehci/res.c (modified) (1 diff)

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
 };
 

uspace/drv/bus/usb/ehci/res.c

@@ -43 +43 @@
 #include <usb/debug.h>
 #include <device/hw_res_parsed.h>
-#include <device/pci.h>
+#include <pci_dev_iface.h>
 
 #include "res.h"