sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-21 20:40:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

[blockdev] Move block device operations to structure block_device_operations

Browse Source 
Signed-off-by: Laurent Vivier <Laurent.Vivier@bull.net>
This commit is contained in:
Laurent Vivier
2008-11-19 17:31:07 +01:00
committed by Michael Brown
parent b48f37e69a
commit a2686a55c4
5 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/drivers/block/ata.c
View File

@@ -139,6 +139,11 @@ static int ata_identify ( struct block_device *blockdev ) {
return 0;
}
static struct block_device_operations ata_operations = {
.read = ata_read,
.write = ata_write
};
/**
* Initialise ATA device
*
@@ -153,7 +158,6 @@ static int ata_identify ( struct block_device *blockdev ) {
*/
int init_atadev ( struct ata_device *ata ) {
/** Fill in read and write methods, and get device capacity */
ata->blockdev.read = ata_read;
ata->blockdev.write = ata_write;
ata->blockdev.op = &ata_operations;
return ata_identify ( &ata->blockdev );
}

8
src/drivers/block/ramdisk.c
View File

@@ -75,6 +75,11 @@ static int ramdisk_write ( struct block_device *blockdev, uint64_t block,
return 0;
}
static struct block_device_operations ramdisk_operations = {
.read = ramdisk_read,
.write = ramdisk_write
};
int init_ramdisk ( struct ramdisk *ramdisk, userptr_t data, size_t len,
unsigned int blksize ) {
@@ -82,8 +87,7 @@ int init_ramdisk ( struct ramdisk *ramdisk, userptr_t data, size_t len,
blksize = 512;
ramdisk->data = data;
ramdisk->blockdev.read = ramdisk_read;
ramdisk->blockdev.write = ramdisk_write;
ramdisk->blockdev.op = &ramdisk_operations;
ramdisk->blockdev.blksize = blksize;
ramdisk->blockdev.blocks = ( len / blksize );

16
src/drivers/block/scsi.c
View File

@@ -228,6 +228,16 @@ static int scsi_read_capacity_16 ( struct block_device *blockdev ) {
return 0;
}
static struct block_device_operations scsi_operations_16 = {
.read = scsi_read_16,
.write = scsi_write_16,
};
static struct block_device_operations scsi_operations_10 = {
.read = scsi_read_10,
.write = scsi_write_10,
};
/**
* Initialise SCSI device
*
@@ -250,8 +260,7 @@ int init_scsidev ( struct scsi_device *scsi ) {
scsi_read_capacity_10 ( &scsi->blockdev );
/* Try READ CAPACITY (10), which is a mandatory command, first. */
scsi->blockdev.read = scsi_read_10;
scsi->blockdev.write = scsi_write_10;
scsi->blockdev.op = &scsi_operations_10;
if ( ( rc = scsi_read_capacity_10 ( &scsi->blockdev ) ) != 0 )
return rc;
@@ -261,8 +270,7 @@ int init_scsidev ( struct scsi_device *scsi ) {
* mandatory, so we can't just use it straight off.
*/
if ( scsi->blockdev.blocks == 0 ) {
scsi->blockdev.read = scsi_read_16;
scsi->blockdev.write = scsi_write_16;
scsi->blockdev.op = &scsi_operations_16;
if ( ( rc = scsi_read_capacity_16 ( &scsi->blockdev ) ) != 0 )
return rc;
}