aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2014-12-29 09:58:48 -0500
committerKevin O'Connor <kevin@koconnor.net>2014-12-29 09:58:48 -0500
commitef102af2a91a2b7fa3c5aaeee02df87334da6670 (patch)
tree0073f371058d039051a7daeac216e8f742327760
parent8ed94b42c0b7f76d2776d9277dc8fa5e0f614ac0 (diff)
downloadseabios-ef102af2a91a2b7fa3c5aaeee02df87334da6670.zip
seabios-ef102af2a91a2b7fa3c5aaeee02df87334da6670.tar.gz
seabios-ef102af2a91a2b7fa3c5aaeee02df87334da6670.tar.bz2
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>
-rw-r--r--src/hw/blockcmd.c14
-rw-r--r--src/hw/blockcmd.h9
2 files changed, 7 insertions, 16 deletions
diff --git a/src/hw/blockcmd.c b/src/hw/blockcmd.c
index ad8814c..78c0e65 100644
--- 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 429b669..df12a6d 100644
--- 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;