Changes in uspace/drv/block/ahci/ahci.c [7f620e8:7de1988c] in mainline

File:

• uspace/drv/block/ahci/ahci.c (modified) (8 diffs)

uspace/drv/block/ahci/ahci.c

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