Split "iSCSI as a SCSI device" out from "iSCSI as a TCP protocol".

1 files changed, 20 insertions, 28 deletions

diff --git a/src/net/tcp/iscsi.c b/src/net/tcp/iscsi.c
index 1f0c45216..345cd5fd1 100644
--- a/src/net/tcp/iscsi.c
+++ b/src/net/tcp/iscsi.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2006 Michael Brown <mbrown@fensystems.co.uk>.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
 #include <stddef.h>
 #include <string.h>
 #include <vsprintf.h>
@@ -543,8 +561,8 @@ static struct tcp_operations iscsi_tcp_operations = {
  * @v command		SCSI command
  * @ret rc		Return status code
  */
-static int iscsi_command ( struct iscsi_session *iscsi,
-			   struct scsi_command *command ) {
+int iscsi_issue ( struct iscsi_session *iscsi,
+		  struct scsi_command *command ) {
 	iscsi->command = command;
 	iscsi->status &= ~( ISCSI_STATUS_DONE | ISCSI_STATUS_ERR );
 
@@ -563,29 +581,3 @@ static int iscsi_command ( struct iscsi_session *iscsi,
 
 	return ( ( iscsi->status & ISCSI_STATUS_ERR ) ? -EIO : 0 );	
 }
-
-/**
- * Issue SCSI command via iSCSI device
- *
- * @v scsi		SCSI device
- * @v command		SCSI command
- * @ret rc		Return status code
- */
-static int iscsi_scsi_command ( struct scsi_device *scsi,
-				struct scsi_command *command ) {
-	struct iscsi_device *iscsidev
-		= container_of ( scsi, struct iscsi_device, scsi );
-
-	return iscsi_command ( &iscsidev->iscsi, command );
-}
-
-/**
- * Initialise iSCSI device
- *
- * @v iscsidev		iSCSI device
- */
-int init_iscsidev ( struct iscsi_device *iscsidev ) {
-	iscsidev->scsi.command = iscsi_scsi_command;
-	iscsidev->scsi.lun = iscsidev->iscsi.lun;
-	return init_scsidev ( &iscsidev->scsi );
-}