Changeset 1b973dc in mainline for uspace/drv

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

Files:

• block/ahci/ahci.c (modified) (8 diffs)
• bus/pci/pciintel/pci.c (modified) (7 diffs)
• bus/usb/ehci/res.c (modified) (1 diff)
• nic/e1k/e1k.c (modified) (1 diff)
• nic/rtl8139/driver.c (modified) (2 diffs)

uspace/drv/block/ahci/ahci.c

@@ -37 +37 @@
 #include <ddf/log.h>
 #include <device/hw_res_parsed.h>
-#include <device/pci.h>
+#include <pci_dev_iface.h>
 #include <sysinfo.h>
 #include <ipc/irc.h>
@@ -111 +111 @@
         }
 
-static int ahci_get_sata_device_name(ddf_fun_t *, size_t, char *);
-static int ahci_get_num_blocks(ddf_fun_t *, uint64_t *);
-static int ahci_get_block_size(ddf_fun_t *, size_t *);
-static int ahci_read_blocks(ddf_fun_t *, uint64_t, size_t, void *);
-static int ahci_write_blocks(ddf_fun_t *, uint64_t, size_t, void *);
+static int get_sata_device_name(ddf_fun_t *, size_t, char *);
+static int get_num_blocks(ddf_fun_t *, uint64_t *);
+static int get_block_size(ddf_fun_t *, size_t *);
+static int read_blocks(ddf_fun_t *, uint64_t, size_t, void *);
+static int write_blocks(ddf_fun_t *, uint64_t, size_t, void *);
 
 static int ahci_identify_device(sata_dev_t *);
@@ -139 +139 @@
 
 static ahci_iface_t ahci_interface = {
-        .get_sata_device_name = &ahci_get_sata_device_name,
-        .get_num_blocks = &ahci_get_num_blocks,
-        .get_block_size = &ahci_get_block_size,
-        .read_blocks = &ahci_read_blocks,
-        .write_blocks = &ahci_write_blocks
+        .get_sata_device_name = &get_sata_device_name,
+        .get_num_blocks = &get_num_blocks,
+        .get_block_size = &get_block_size,
+        .read_blocks = &read_blocks,
+        .write_blocks = &write_blocks
 };
 
@@ -180 +180 @@
  *
  */
-static int ahci_get_sata_device_name(ddf_fun_t *fun,
+static int get_sata_device_name(ddf_fun_t *fun,
     size_t sata_dev_name_length, char *sata_dev_name)
 {
@@ -196 +196 @@
  *
  */
-static int ahci_get_num_blocks(ddf_fun_t *fun, uint64_t *num_blocks)
+static int get_num_blocks(ddf_fun_t *fun, uint64_t *num_blocks)
 {
         sata_dev_t *sata = fun_sata_dev(fun);
@@ -211 +211 @@
  *
  */
-static int ahci_get_block_size(ddf_fun_t *fun, size_t *block_size)
+static int get_block_size(ddf_fun_t *fun, size_t *block_size)
 {
         sata_dev_t *sata = fun_sata_dev(fun);
@@ -228 +228 @@
  *
  */
-static int ahci_read_blocks(ddf_fun_t *fun, uint64_t blocknum,
+static int read_blocks(ddf_fun_t *fun, uint64_t blocknum,
     size_t count, void *buf)
 {
@@ -271 +271 @@
  *
  */
-static int ahci_write_blocks(ddf_fun_t *fun, uint64_t blocknum,
+static int write_blocks(ddf_fun_t *fun, uint64_t blocknum,
     size_t count, void *buf)
 {

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"

uspace/drv/nic/e1k/e1k.c

@@ -50 +50 @@
 #include <ddf/interrupt.h>
 #include <device/hw_res_parsed.h>
-#include <device/pci.h>
+#include <pci_dev_iface.h>
 #include <nic.h>
 #include <ops/nic.h>

uspace/drv/nic/rtl8139/driver.c

@@ -41 +41 @@
 #include <io/log.h>
 #include <nic.h>
-#include <device/pci.h>
+#include <pci_dev_iface.h>
 
 #include <ipc/irc.h>
@@ -190 +190 @@
         return;
 }
-
-#include <device/pci.h>
 
 /** Set PmEn (Power management enable) bit value