block: Rename process_XXX_op() functions to XXX_process_op()

Rename disk driver dispatch functions to a consistent naming style.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

diff --git a/src/block.c b/src/block.c
index 8e5bdad5a72f4af0c8ace2d45546b90437a69540..5e08663242571046e67c01cd08e843c42f13db30 100644 (file)
--- a/src/block.c
+++ b/src/block.c
@@ -525,13 +525,13 @@ process_op_32(struct disk_op_s *op)
     ASSERT32FLAT();
     switch (op->drive_gf->type) {
     case DTYPE_VIRTIO_BLK:
-        return process_virtio_blk_op(op);
+        return virtio_blk_process_op(op);
     case DTYPE_AHCI:
-        return process_ahci_op(op);
+        return ahci_process_op(op);
     case DTYPE_AHCI_ATAPI:
         return ahci_atapi_process_op(op);
     case DTYPE_SDCARD:
-        return process_sdcard_op(op);
+        return sdcard_process_op(op);
     case DTYPE_USB_32:
         return usb_process_op(op);
     case DTYPE_UAS_32:
@@ -552,13 +552,13 @@ process_op_16(struct disk_op_s *op)
     ASSERT16();
     switch (GET_GLOBALFLAT(op->drive_gf->type)) {
     case DTYPE_FLOPPY:
-        return process_floppy_op(op);
+        return floppy_process_op(op);
     case DTYPE_ATA:
-        return process_ata_op(op);
+        return ata_process_op(op);
     case DTYPE_RAMDISK:
-        return process_ramdisk_op(op);
+        return ramdisk_process_op(op);
     case DTYPE_CDEMU:
-        return process_cdemu_op(op);
+        return cdemu_process_op(op);
     default:
         return process_op_both(op);
     }

diff --git a/src/cdrom.c b/src/cdrom.c
index 60964bda24bbc43965040db96428d5c70b1cbee3..00e9e09ea1534bfe27b268317a7a05f0726550b6 100644 (file)
--- a/src/cdrom.c
+++ b/src/cdrom.c
@@ -89,7 +89,7 @@ cdemu_read(struct disk_op_s *op)
 }
 
 int
-process_cdemu_op(struct disk_op_s *op)
+cdemu_process_op(struct disk_op_s *op)
 {
     if (!CONFIG_CDROM_EMU)
         return 0;

diff --git a/src/hw/ahci.c b/src/hw/ahci.c
index 726fe25eed1da6463186a183c838d3bf7f3ea8c8..83b747cb2c410b601d05893f2158a824fdafd3b3 100644 (file)
--- a/src/hw/ahci.c
+++ b/src/hw/ahci.c
@@ -296,7 +296,7 @@ ahci_disk_readwrite(struct disk_op_s *op, int iswrite)
 
 // command demuxer
 int
-process_ahci_op(struct disk_op_s *op)
+ahci_process_op(struct disk_op_s *op)
 {
     if (!CONFIG_AHCI)
         return 0;

diff --git a/src/hw/ahci.h b/src/hw/ahci.h
index 16ad6a984f6251dbf56b254f28d7ff52cf4c8cf7..fa11d66197260336d437588b365c029e980752c5 100644 (file)
--- a/src/hw/ahci.h
+++ b/src/hw/ahci.h
@@ -83,7 +83,7 @@ struct ahci_port_s {
 };
 
 void ahci_setup(void);
-int process_ahci_op(struct disk_op_s *op);
+int ahci_process_op(struct disk_op_s *op);
 int ahci_atapi_process_op(struct disk_op_s *op);
 
 #define AHCI_IRQ_ON_SG            (1 << 31)

diff --git a/src/hw/ata.c b/src/hw/ata.c
index b5bd75f463e33d311b228711ff665015b9fee90d..3efc6ab550475709dbdb592f7e8362769b95405b 100644 (file)
--- a/src/hw/ata.c
+++ b/src/hw/ata.c
@@ -552,7 +552,7 @@ ata_readwrite(struct disk_op_s *op, int iswrite)
 
 // 16bit command demuxer for ATA harddrives.
 int
-process_ata_op(struct disk_op_s *op)
+ata_process_op(struct disk_op_s *op)
 {
     if (!CONFIG_ATA)
         return 0;

diff --git a/src/hw/ata.h b/src/hw/ata.h
index 3a7ab6558f030a1cc0455b843471014938f964b3..65bfcb7dffc6b0cb7fc4d42ffb30b02a86f83165 100644 (file)
--- a/src/hw/ata.h
+++ b/src/hw/ata.h
@@ -24,10 +24,9 @@ struct atadrive_s {
 // ata.c
 char *ata_extract_model(char *model, u32 size, u16 *buffer);
 int ata_extract_version(u16 *buffer);
-int cdrom_read(struct disk_op_s *op);
+int ata_process_op(struct disk_op_s *op);
 int ata_atapi_process_op(struct disk_op_s *op);
 void ata_setup(void);
-int process_ata_op(struct disk_op_s *op);
 
 #define PORT_ATA2_CMD_BASE     0x0170
 #define PORT_ATA1_CMD_BASE     0x01f0

diff --git a/src/hw/floppy.c b/src/hw/floppy.c
index d60362a344964e80e61459886e6ccc39f8e2ac6d..a14f7e093fcc46990a0b0cbf3c32e0a067a790f7 100644 (file)
--- a/src/hw/floppy.c
+++ b/src/hw/floppy.c
@@ -613,7 +613,7 @@ floppy_format(struct disk_op_s *op)
 }
 
 int
-process_floppy_op(struct disk_op_s *op)
+floppy_process_op(struct disk_op_s *op)
 {
     if (!CONFIG_FLOPPY)
         return 0;

diff --git a/src/hw/ramdisk.c b/src/hw/ramdisk.c
index 67ba59c1c3b3eacc7f4206cdb10e18641b74565c..e847824c78281709359b96d0112df16711ae842c 100644 (file)
--- a/src/hw/ramdisk.c
+++ b/src/hw/ramdisk.c
@@ -91,7 +91,7 @@ ramdisk_copy(struct disk_op_s *op, int iswrite)
 }
 
 int
-process_ramdisk_op(struct disk_op_s *op)
+ramdisk_process_op(struct disk_op_s *op)
 {
     if (!CONFIG_FLASH_FLOPPY)
         return 0;

diff --git a/src/hw/sdcard.c b/src/hw/sdcard.c
index 965543c56e63224484b7e7c9a92ae89ed6d601dc..d2c32881065b3c49abce8bfac51b2c7276fd6496 100644 (file)
--- a/src/hw/sdcard.c
+++ b/src/hw/sdcard.c
@@ -209,7 +209,7 @@ sdcard_readwrite(struct disk_op_s *op, int iswrite)
 }
 
 int
-process_sdcard_op(struct disk_op_s *op)
+sdcard_process_op(struct disk_op_s *op)
 {
     if (!CONFIG_SDCARD)
         return 0;

diff --git a/src/hw/virtio-blk.c b/src/hw/virtio-blk.c
index 92a5546b2aae3ba09fe16b95f32c20446702b2ef..94485e2ac0a288659ed88931a209e6d054288f43 100644 (file)
--- a/src/hw/virtio-blk.c
+++ b/src/hw/virtio-blk.c
@@ -78,7 +78,7 @@ virtio_blk_op(struct disk_op_s *op, int write)
 }
 
 int
-process_virtio_blk_op(struct disk_op_s *op)
+virtio_blk_process_op(struct disk_op_s *op)
 {
     if (! CONFIG_VIRTIO_BLK)
         return 0;

diff --git a/src/hw/virtio-blk.h b/src/hw/virtio-blk.h
index b233c744b2aba5517ef9f63166982fb1ba7b2836..157bed62744aa2c71363a0397235ea18f01f0bc3 100644 (file)
--- a/src/hw/virtio-blk.h
+++ b/src/hw/virtio-blk.h
@@ -37,7 +37,7 @@ struct virtio_blk_outhdr {
 #define VIRTIO_BLK_S_UNSUPP     2
 
 struct disk_op_s;
-int process_virtio_blk_op(struct disk_op_s *op);
+int virtio_blk_process_op(struct disk_op_s *op);
 void virtio_blk_setup(void);
 
 #endif /* _VIRTIO_BLK_H */

diff --git a/src/util.h b/src/util.h
index 6250c12888546d738fc37456b027f3004137e348..cea844f9fda2a807d8ffe955c684c65994ad907f 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -47,7 +47,7 @@ extern u8 CDRom_locks[];
 extern struct eltorito_s CDEmu;
 extern struct drive_s *cdemu_drive_gf;
 struct disk_op_s;
-int process_cdemu_op(struct disk_op_s *op);
+int cdemu_process_op(struct disk_op_s *op);
 void cdrom_prepboot(void);
 int cdrom_boot(struct drive_s *drive_g);
 
@@ -143,15 +143,15 @@ extern struct floppy_ext_dbt_s diskette_param_table2;
 void floppy_setup(void);
 struct drive_s *init_floppy(int floppyid, int ftype);
 int find_floppy_type(u32 size);
-int process_floppy_op(struct disk_op_s *op);
+int floppy_process_op(struct disk_op_s *op);
 void floppy_tick(void);
 
 // hw/ramdisk.c
 void ramdisk_setup(void);
-int process_ramdisk_op(struct disk_op_s *op);
+int ramdisk_process_op(struct disk_op_s *op);
 
 // hw/sdcard.c
-int process_sdcard_op(struct disk_op_s *op);
+int sdcard_process_op(struct disk_op_s *op);
 void sdcard_setup(void);
 
 // hw/timer.c