Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-13 19:44:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Completed SCSIOP_READ_CAPACITY, SCSIOP_REPORT_LUNS, SCSIOP_READ

Browse source 
Updated INQUIRY Fields
Code Fixes
Stable, Tested, AHCI-Detection and Read working

svn path=/branches/GSoC_2016/AHCI/; revision=71987
This commit is contained in:
Aman Priyadarshi 2016-07-23 22:53:15 +00:00
parent 93ea028360
commit 05153b057d
2 changed files with 562 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

663
drivers/storage/storahci/storahci.c
View file

File diff suppressed because it is too large Load diff

45
drivers/storage/storahci/storahci.h
View file

@ -19,6 +19,8 @@
#define MAXIMUM_QUEUE_BUFFER_SIZE 255 #define MAXIMUM_QUEUE_BUFFER_SIZE 255
#define MAXIMUM_TRANSFER_LENGTH (128*1024) // 128 KB #define MAXIMUM_TRANSFER_LENGTH (128*1024) // 128 KB
#define DEVICE_ATA_BLOCK_SIZE 512
// device type (DeviceParams) // device type (DeviceParams)
#define AHCI_DEVICE_TYPE_ATA 1 #define AHCI_DEVICE_TYPE_ATA 1
#define AHCI_DEVICE_TYPE_ATAPI 2 #define AHCI_DEVICE_TYPE_ATAPI 2
@ -54,6 +56,7 @@
// ATA Functions // ATA Functions
#define ATA_FUNCTION_ATA_COMMAND 0x100 #define ATA_FUNCTION_ATA_COMMAND 0x100
#define ATA_FUNCTION_ATA_IDENTIFY 0x101 #define ATA_FUNCTION_ATA_IDENTIFY 0x101
#define ATA_FUNCTION_ATA_READ 0x102
// ATAPI Functions // ATAPI Functions
#define ATA_FUNCTION_ATAPI_COMMAND 0x200 #define ATA_FUNCTION_ATAPI_COMMAND 0x200
@ -61,6 +64,8 @@
// ATA Flags // ATA Flags
#define ATA_FLAGS_DATA_IN (1 << 1) #define ATA_FLAGS_DATA_IN (1 << 1)
#define ATA_FLAGS_DATA_OUT (1 << 2) #define ATA_FLAGS_DATA_OUT (1 << 2)
#define ATA_FLAGS_48BIT_COMMAND (1 << 3)
#define ATA_FLAGS_USE_DMA (1 << 4)
#define IsAtaCommand(AtaFunction) (AtaFunction & ATA_FUNCTION_ATA_COMMAND) #define IsAtaCommand(AtaFunction) (AtaFunction & ATA_FUNCTION_ATA_COMMAND)
#define IsAtapiCommand(AtaFunction) (AtaFunction & ATA_FUNCTION_ATAPI_COMMAND) #define IsAtapiCommand(AtaFunction) (AtaFunction & ATA_FUNCTION_ATAPI_COMMAND)
@ -72,7 +77,7 @@
#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))
#ifdef DBG #ifdef DBG
#define DebugPrint(format, ...) StorPortDebugPrint(0, format, __VA_ARGS__) #define AhciDebugPrint(format, ...) StorPortDebugPrint(0, format, __VA_ARGS__)
#endif #endif
typedef typedef
@ -464,6 +469,12 @@ typedef struct _AHCI_PORT_EXTENSION
UCHAR AccessType; UCHAR AccessType;
UCHAR DeviceType; UCHAR DeviceType;
UCHAR IsActive; UCHAR IsActive;
LARGE_INTEGER MaxLba;
ULONG BytesPerLogicalSector;
ULONG BytesPerPhysicalSector;
// UCHAR VendorId[41];
// UCHAR RevisionID[9];
// UCHAR SerialNumber[21];
} DeviceParams; } DeviceParams;
STOR_DPC CommandCompletion; STOR_DPC CommandCompletion;
@ -542,7 +553,12 @@ typedef struct _AHCI_SRB_EXTENSION
ULONG SlotIndex; ULONG SlotIndex;
LOCAL_SCATTER_GATHER_LIST Sgl; LOCAL_SCATTER_GATHER_LIST Sgl;
PLOCAL_SCATTER_GATHER_LIST pSgl;
PAHCI_COMPLETION_ROUTINE CompletionRoutine; PAHCI_COMPLETION_ROUTINE CompletionRoutine;
// for alignment purpose -- 128 byte alignment
// do not try to access (R/W) this field
UCHAR Reserved[128];
} AHCI_SRB_EXTENSION, *PAHCI_SRB_EXTENSION; } AHCI_SRB_EXTENSION, *PAHCI_SRB_EXTENSION;
////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////
@ -568,12 +584,29 @@ IsPortValid (
__in ULONG pathId __in ULONG pathId
); );
UCHAR DeviceRequestReadWrite (
__in PAHCI_ADAPTER_EXTENSION AdapterExtension,
__in PSCSI_REQUEST_BLOCK Srb,
__in PCDB Cdb
);
UCHAR DeviceRequestCapacity (
__in PAHCI_ADAPTER_EXTENSION AdapterExtension,
__in PSCSI_REQUEST_BLOCK Srb,
__in PCDB Cdb
);
UCHAR UCHAR
DeviceInquiryRequest ( DeviceInquiryRequest (
__in PAHCI_ADAPTER_EXTENSION AdapterExtension, __in PAHCI_ADAPTER_EXTENSION AdapterExtension,
__in PSCSI_REQUEST_BLOCK Srb, __in PSCSI_REQUEST_BLOCK Srb,
__in PCDB Cdb, __in PCDB Cdb
__in BOOLEAN HasProductDataRequest );
UCHAR DeviceReportLuns (
__in PAHCI_ADAPTER_EXTENSION AdapterExtension,
__in PSCSI_REQUEST_BLOCK Srb,
__in PCDB Cdb
); );
__inline __inline
@ -595,6 +628,12 @@ GetSrbExtension(
__in PSCSI_REQUEST_BLOCK Srb __in PSCSI_REQUEST_BLOCK Srb
); );
__inline
ULONG64
AhciGetLba (
__in PCDB Cdb
);
////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////
// Assertions // // Assertions //
////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////