sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-17 18:11:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Brown
2006-05-14 23:29:16 +00:00
parent 29fb77b0a4
commit f25731d08f
3 changed files with 75 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/drivers/scsi/iscsidev.c Normal file
View File

@@ -0,0 +1,52 @@
/*
* 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 <gpxe/iscsi.h>
/** @file
*
* iSCSI SCSI device
*
*/
/**
* Issue SCSI command via iSCSI device
*
* @v scsi SCSI device
* @v command SCSI command
* @ret rc Return status code
*/
static int iscsi_command ( struct scsi_device *scsi,
struct scsi_command *command ) {
struct iscsi_device *iscsidev
= container_of ( scsi, struct iscsi_device, scsi );
return iscsi_issue ( &iscsidev->iscsi, command );
}
/**
* Initialise iSCSI device
*
* @v iscsidev iSCSI device
*/
int init_iscsidev ( struct iscsi_device *iscsidev ) {
iscsidev->scsi.command = iscsi_command;
iscsidev->scsi.lun = iscsidev->iscsi.lun;
return init_scsidev ( &iscsidev->scsi );
}

3
src/include/gpxe/iscsi.h
View File

@@ -513,6 +513,9 @@ struct iscsi_session {
/** Maximum number of retries at connecting */ /** Maximum number of retries at connecting */
#define ISCSI_MAX_RETRIES 2 #define ISCSI_MAX_RETRIES 2
extern int iscsi_issue ( struct iscsi_session *iscsi,
struct scsi_command *command );
/** An iSCSI device */ /** An iSCSI device */
struct iscsi_device { struct iscsi_device {
/** SCSI device interface */ /** SCSI device interface */

48
src/net/tcp/iscsi.c
View File

@@ -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 <stddef.h>
#include <string.h> #include <string.h>
#include <vsprintf.h> #include <vsprintf.h>
@@ -543,8 +561,8 @@ static struct tcp_operations iscsi_tcp_operations = {
* @v command SCSI command * @v command SCSI command
* @ret rc Return status code * @ret rc Return status code
*/ */
static int iscsi_command ( struct iscsi_session *iscsi, int iscsi_issue ( struct iscsi_session *iscsi,
struct scsi_command *command ) { struct scsi_command *command ) {
iscsi->command = command; iscsi->command = command;
iscsi->status &= ~( ISCSI_STATUS_DONE | ISCSI_STATUS_ERR ); 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 ); 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 );
}