scsi: Don't export cdb_* functions

The low-level cdb_* functions are now only used from within
cmdblock.c, so don't export them.

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

diff --git a/src/hw/blockcmd.c b/src/hw/blockcmd.c
index ad8814c3b2bcf9482eb9650f39a60f80e4d6000d..78c0e65f456c2810816564b8ea605933cd3abbae 100644 (file)
--- a/src/hw/blockcmd.c
+++ b/src/hw/blockcmd.c
@@ -72,7 +72,7 @@ cdb_is_read(u8 *cdbcmd, u16 blocksize)
  * Low level command requests
  ****************************************************************/
 
-int
+static int
 cdb_get_inquiry(struct disk_op_s *op, struct cdbres_inquiry *data)
 {
     struct cdb_request_sense cmd;
@@ -85,7 +85,7 @@ cdb_get_inquiry(struct disk_op_s *op, struct cdbres_inquiry *data)
 }
 
 // Request SENSE
-int
+static int
 cdb_get_sense(struct disk_op_s *op, struct cdbres_request_sense *data)
 {
     struct cdb_request_sense cmd;
@@ -98,7 +98,7 @@ cdb_get_sense(struct disk_op_s *op, struct cdbres_request_sense *data)
 }
 
 // Test unit ready
-int
+static int
 cdb_test_unit_ready(struct disk_op_s *op)
 {
     struct cdb_request_sense cmd;
@@ -110,7 +110,7 @@ cdb_test_unit_ready(struct disk_op_s *op)
 }
 
 // Request capacity
-int
+static int
 cdb_read_capacity(struct disk_op_s *op, struct cdbres_read_capacity *data)
 {
     struct cdb_read_capacity cmd;
@@ -122,7 +122,7 @@ cdb_read_capacity(struct disk_op_s *op, struct cdbres_read_capacity *data)
 }
 
 // Mode sense, geometry page.
-int
+static int
 cdb_mode_sense_geom(struct disk_op_s *op, struct cdbres_mode_sense_geom *data)
 {
     struct cdb_mode_sense cmd;
@@ -137,7 +137,7 @@ cdb_mode_sense_geom(struct disk_op_s *op, struct cdbres_mode_sense_geom *data)
 }
 
 // Read sectors.
-int
+static int
 cdb_read(struct disk_op_s *op)
 {
     struct cdb_rwdata_10 cmd;
@@ -149,7 +149,7 @@ cdb_read(struct disk_op_s *op)
 }
 
 // Write sectors.
-int
+static int
 cdb_write(struct disk_op_s *op)
 {
     struct cdb_rwdata_10 cmd;

diff --git a/src/hw/blockcmd.h b/src/hw/blockcmd.h
index 429b669b78882ff3c7581a11ed6296a5a65ce255..df12a6d424be4acc109e4652bc3fc5fd76e93784 100644 (file)
--- a/src/hw/blockcmd.h
+++ b/src/hw/blockcmd.h
@@ -102,15 +102,6 @@ struct cdbres_mode_sense_geom {
 // blockcmd.c
 int cdb_is_read(u8 *cdbcmd, u16 blocksize);
 struct disk_op_s;
-int cdb_get_inquiry(struct disk_op_s *op, struct cdbres_inquiry *data);
-int cdb_get_sense(struct disk_op_s *op, struct cdbres_request_sense *data);
-int cdb_test_unit_ready(struct disk_op_s *op);
-int cdb_read_capacity(struct disk_op_s *op, struct cdbres_read_capacity *data);
-int cdb_mode_sense_geom(struct disk_op_s *op, struct cdbres_mode_sense_geom *data);
-int cdb_inquiry(struct disk_op_s *op, struct cdbres_inquiry *data);
-int cdb_read(struct disk_op_s *op);
-int cdb_write(struct disk_op_s *op);
-
 int scsi_process_op(struct disk_op_s *op);
 int scsi_is_ready(struct disk_op_s *op);
 struct drive_s;