Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-29 07:39:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update UniATA Driver to Version 0.3.9f. It works well in ROS.

Browse source 
thx to Samuel Serapión aka encoded.

svn path=/trunk/; revision=32763
This commit is contained in:
Daniel Reimer 2008-03-24 21:35:52 +00:00
parent 5830d67c51
commit 39f5b70ba0
18 changed files with 1835 additions and 473 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
reactos/drivers/storage/ide/uniata/atapi.h
View file

@ -86,19 +86,20 @@ ScsiDebugPrint(
#define PRINT_PREFIX 0, #define PRINT_PREFIX 0,
#define KdPrint3(_x_) ScsiDebugPrint _x_ {;}
#define KdPrint2(_x_) {ScsiDebugPrint("%x: ", PsGetCurrentThread()) ; ScsiDebugPrint _x_ ; } #define KdPrint2(_x_) {ScsiDebugPrint("%x: ", PsGetCurrentThread()) ; ScsiDebugPrint _x_ ; }
#define KdPrint(_x_) ScsiDebugPrint _x_ #define KdPrint(_x_) ScsiDebugPrint _x_ {;}
#else // SCSI_PORT_DBG_PRINT #else // SCSI_PORT_DBG_PRINT
#ifndef USE_DBGPRINT_LOGGER //#ifndef USE_DBGPRINT_LOGGER
ULONG //ULONG
_cdecl //_cdecl
DbgPrint( //DbgPrint(
const CHAR * Format, // PCH Format,
... // ...
); // );
#endif // USE_DBGPRINT_LOGGER //#endif // USE_DBGPRINT_LOGGER
#define PRINT_PREFIX #define PRINT_PREFIX
@ -107,6 +108,7 @@ DbgPrint(
//#define LOG_ON_RAISED_IRQL_W2K TRUE //#define LOG_ON_RAISED_IRQL_W2K TRUE
//#define LOG_ON_RAISED_IRQL_W2K FALSE //#define LOG_ON_RAISED_IRQL_W2K FALSE
#define KdPrint3(_x_) {if(LOG_ON_RAISED_IRQL_W2K || MajorVersion < 0x05 || KeGetCurrentIrql() <= 2){/*DbgPrint("%x: ", PsGetCurrentThread()) ;*/ DbgPrint _x_ ; if(g_LogToDisplay){ PrintNtConsole _x_ ;} }}
#define KdPrint2(_x_) {if(LOG_ON_RAISED_IRQL_W2K || MajorVersion < 0x05 || KeGetCurrentIrql() <= 2){/*DbgPrint("%x: ", PsGetCurrentThread()) ;*/ DbgPrint _x_ ; if(g_LogToDisplay){ PrintNtConsole _x_ ;} }} #define KdPrint2(_x_) {if(LOG_ON_RAISED_IRQL_W2K || MajorVersion < 0x05 || KeGetCurrentIrql() <= 2){/*DbgPrint("%x: ", PsGetCurrentThread()) ;*/ DbgPrint _x_ ; if(g_LogToDisplay){ PrintNtConsole _x_ ;} }}
#define KdPrint(_x_) {if(LOG_ON_RAISED_IRQL_W2K || MajorVersion < 0x05 || KeGetCurrentIrql() <= 2){/*DbgPrint("%x: ", PsGetCurrentThread()) ;*/ DbgPrint _x_ ; if(g_LogToDisplay){ PrintNtConsole _x_ ;} }} #define KdPrint(_x_) {if(LOG_ON_RAISED_IRQL_W2K || MajorVersion < 0x05 || KeGetCurrentIrql() <= 2){/*DbgPrint("%x: ", PsGetCurrentThread()) ;*/ DbgPrint _x_ ; if(g_LogToDisplay){ PrintNtConsole _x_ ;} }}
/* /*
@ -136,8 +138,12 @@ DbgPrint(
#else // _DEBUG #else // _DEBUG
#define KdPrint2(_x_) #define PRINT_PREFIX "UniATA: "
#define KdPrint(_x_)
//#define KdPrint3(_x_) {if(LOG_ON_RAISED_IRQL_W2K || MajorVersion < 0x05 || KeGetCurrentIrql() <= 2){/*DbgPrint("%x: ", PsGetCurrentThread()) ;*/ DbgPrint _x_ ; if(g_LogToDisplay){ PrintNtConsole _x_ ;} }}
#define KdPrint3(_x_) {;}
#define KdPrint2(_x_) {;}
#define KdPrint(_x_) {;}
#define Connect_DbgPrint() {;} #define Connect_DbgPrint() {;}
#define AtapiStallExecution(dt) ScsiPortStallExecution(dt) #define AtapiStallExecution(dt) ScsiPortStallExecution(dt)
@ -235,6 +241,9 @@ typedef struct _IDE_REGISTERS_2 {
#define DFLAGS_RCACHE_ENABLED 0x1000 // Indicates that we use read cache #define DFLAGS_RCACHE_ENABLED 0x1000 // Indicates that we use read cache
#define DFLAGS_ORIG_GEOMETRY 0x2000 // #define DFLAGS_ORIG_GEOMETRY 0x2000 //
#define DFLAGS_REINIT_DMA 0x4000 // #define DFLAGS_REINIT_DMA 0x4000 //
#define DFLAGS_HIDDEN 0x8000 // Hidden device, available only with special IOCTLs
// via communication virtual device
//#define DFLAGS_ 0x10000 //
// //
// Used to disable 'advanced' features. // Used to disable 'advanced' features.
// //
@ -287,6 +296,7 @@ typedef struct _MODE_PARAMETER_HEADER_10 {
#define IDE_COMMAND_ATAPI_RESET 0x08 #define IDE_COMMAND_ATAPI_RESET 0x08
#define IDE_COMMAND_RECALIBRATE 0x10 #define IDE_COMMAND_RECALIBRATE 0x10
#define IDE_COMMAND_READ 0x20 #define IDE_COMMAND_READ 0x20
#define IDE_COMMAND_READ_NO_RETR 0x21
#define IDE_COMMAND_READ48 0x24 #define IDE_COMMAND_READ48 0x24
#define IDE_COMMAND_READ_DMA48 0x25 #define IDE_COMMAND_READ_DMA48 0x25
#define IDE_COMMAND_READ_DMA_Q48 0x26 #define IDE_COMMAND_READ_DMA_Q48 0x26
@ -296,6 +306,7 @@ typedef struct _MODE_PARAMETER_HEADER_10 {
#define IDE_COMMAND_READ_STREAM48 0x2B #define IDE_COMMAND_READ_STREAM48 0x2B
#define IDE_COMMAND_READ_LOG48 0x2f #define IDE_COMMAND_READ_LOG48 0x2f
#define IDE_COMMAND_WRITE 0x30 #define IDE_COMMAND_WRITE 0x30
#define IDE_COMMAND_WRITE_NO_RETR 0x31
#define IDE_COMMAND_WRITE48 0x34 #define IDE_COMMAND_WRITE48 0x34
#define IDE_COMMAND_WRITE_DMA48 0x35 #define IDE_COMMAND_WRITE_DMA48 0x35
#define IDE_COMMAND_WRITE_DMA_Q48 0x36 #define IDE_COMMAND_WRITE_DMA_Q48 0x36
@ -849,8 +860,10 @@ NATIVE_MODE_CONTROLLER_INFORMATION const NativeModeAdapters[] = {
AtapiWritePort1(chan, IDX_IO1_o_Command, _Command); AtapiWritePort1(chan, IDX_IO1_o_Command, _Command);
#define SelectDrive(chan, unit) \ #define SelectDrive(chan, unit) { \
AtapiWritePort1(chan, IDX_IO1_o_DriveSelect, (unit) ? IDE_DRIVE_SELECT_2 : IDE_DRIVE_SELECT_1); if(chan && chan->lun[unit] && chan->lun[unit]->DeviceFlags & DFLAGS_ATAPI_CHANGER) KdPrint3((" Select %d\n", unit)); \
AtapiWritePort1(chan, IDX_IO1_o_DriveSelect, (unit) ? IDE_DRIVE_SELECT_2 : IDE_DRIVE_SELECT_1); \
}
#define ReadBuffer(chan, Buffer, Count, timing) \ #define ReadBuffer(chan, Buffer, Count, timing) \
@ -1054,10 +1067,12 @@ CheckDevice(
IN BOOLEAN ResetBus IN BOOLEAN ResetBus
); );
#define UNIATA_FIND_DEV_UNHIDE 0x01
BOOLEAN BOOLEAN
FindDevices( FindDevices(
IN PVOID HwDeviceExtension, IN PVOID HwDeviceExtension,
IN BOOLEAN AtapiOnly, IN ULONG Flags,
IN ULONG Channel IN ULONG Channel
); );
@ -1154,8 +1169,10 @@ AtapiDisableInterrupts(
IN ULONG c IN ULONG c
); );
#define CHAN_NOT_SPECIFIED (0xffffffffL) #define CHAN_NOT_SPECIFIED (0xffffffffL)
#define DEVNUM_NOT_SPECIFIED (0xffffffffL) #define CHAN_NOT_SPECIFIED_CHECK_CABLE (0xfffffffeL)
#define DEVNUM_NOT_SPECIFIED (0xffffffffL)
#define IOMODE_NOT_SPECIFIED (0xffffffffL)
extern ULONG extern ULONG
AtapiRegCheckDevValue( AtapiRegCheckDevValue(

33
reactos/drivers/storage/ide/uniata/bm_devs.h
View file

@ -78,7 +78,8 @@ Revision History:
// define PIO timings in nanoseconds // define PIO timings in nanoseconds
#define PIO0_TIMING 600 #define PIO0_TIMING 600
#define UniataGetPioTiming(LunExt) ((LunExt->TransferMode <= ATA_PIO0) ? PIO0_TIMING : 0) //#define UniataGetPioTiming(LunExt) ((LunExt->TransferMode <= ATA_PIO0) ? PIO0_TIMING : 0)
#define UniataGetPioTiming(LunExt) 0 //ktp
#ifndef __IDE_BUSMASTER_DEVICES_H__ #ifndef __IDE_BUSMASTER_DEVICES_H__
#define __IDE_BUSMASTER_DEVICES_H__ #define __IDE_BUSMASTER_DEVICES_H__
@ -101,6 +102,7 @@ typedef struct _BUSMASTER_CONTROLLER_INFORMATION {
CHAR channel; CHAR channel;
// CHAR numOfChannes; // CHAR numOfChannes;
CHAR MasterDev; CHAR MasterDev;
BOOLEAN Known;
#ifndef USER_MODE #ifndef USER_MODE
CHAR ChanInitOk; // 0x01 - primary, 0x02 - secondary CHAR ChanInitOk; // 0x01 - primary, 0x02 - secondary
BOOLEAN Isr2Enable; BOOLEAN Isr2Enable;
@ -198,6 +200,9 @@ typedef struct _BUSMASTER_CONTROLLER_INFORMATION {
#define ATA_NATIONAL_ID 0x100b #define ATA_NATIONAL_ID 0x100b
#define ATA_SC1100 0x0502100b #define ATA_SC1100 0x0502100b
#define ATA_NETCELL_ID 0x169c
#define ATA_NETCELL_SR 0x0044169c
#define ATA_NVIDIA_ID 0x10de #define ATA_NVIDIA_ID 0x10de
#define ATA_NFORCE1 0x01bc10de #define ATA_NFORCE1 0x01bc10de
#define ATA_NFORCE2 0x006510de #define ATA_NFORCE2 0x006510de
@ -354,6 +359,7 @@ typedef struct _BUSMASTER_CONTROLLER_INFORMATION {
#define UNIATA_NO_DPC 0x08000000 #define UNIATA_NO_DPC 0x08000000
#define UNIATA_NO_DPC_ATAPI 0x04000000 #define UNIATA_NO_DPC_ATAPI 0x04000000
#define UNIATA_AHCI 0x02000000 #define UNIATA_AHCI 0x02000000
#define UNIATA_NO80CHK 0x01000000
#define ATPOLD 0x0100 #define ATPOLD 0x0100
@ -440,11 +446,11 @@ typedef struct _BUSMASTER_CONTROLLER_INFORMATION {
BUSMASTER_CONTROLLER_INFORMATION const BusMasterAdapters[] = { BUSMASTER_CONTROLLER_INFORMATION const BusMasterAdapters[] = {
PCI_DEV_HW_SPEC_BM( 0005, 1191, 0x00, ATA_UDMA2, "Acard ATP850" , ATPOLD | UNIATA_SIMPLEX_ONLY ), PCI_DEV_HW_SPEC_BM( 0005, 1191, 0x00, ATA_UDMA2, "Acard ATP850" , ATPOLD | UNIATA_SIMPLEX_ONLY ),
PCI_DEV_HW_SPEC_BM( 0006, 1191, 0x00, ATA_UDMA4, "Acard ATP860A" , 0 ), PCI_DEV_HW_SPEC_BM( 0006, 1191, 0x00, ATA_UDMA4, "Acard ATP860A" , UNIATA_NO80CHK ),
PCI_DEV_HW_SPEC_BM( 0007, 1191, 0x00, ATA_UDMA4, "Acard ATP860R" , 0 ), PCI_DEV_HW_SPEC_BM( 0007, 1191, 0x00, ATA_UDMA4, "Acard ATP860R" , UNIATA_NO80CHK ),
PCI_DEV_HW_SPEC_BM( 0008, 1191, 0x00, ATA_UDMA6, "Acard ATP865A" , 0 ), PCI_DEV_HW_SPEC_BM( 0008, 1191, 0x00, ATA_UDMA6, "Acard ATP865A" , UNIATA_NO80CHK ),
PCI_DEV_HW_SPEC_BM( 0009, 1191, 0x00, ATA_UDMA6, "Acard ATP865R" , 0 ), PCI_DEV_HW_SPEC_BM( 0009, 1191, 0x00, ATA_UDMA6, "Acard ATP865R" , UNIATA_NO80CHK ),
PCI_DEV_HW_SPEC_BM( 5289, 10b9, 0x00, ATA_SA150, "ALI M5289" , UNIATA_SATA | UNIATA_NO_SLAVE ), PCI_DEV_HW_SPEC_BM( 5289, 10b9, 0x00, ATA_SA150, "ALI M5289" , UNIATA_SATA | UNIATA_NO_SLAVE ),
PCI_DEV_HW_SPEC_BM( 5288, 10b9, 0x00, ATA_SA300, "ALI M5288" , UNIATA_SATA | UNIATA_NO_SLAVE ), PCI_DEV_HW_SPEC_BM( 5288, 10b9, 0x00, ATA_SA300, "ALI M5288" , UNIATA_SATA | UNIATA_NO_SLAVE ),
PCI_DEV_HW_SPEC_BM( 5287, 10b9, 0x00, ATA_SA150, "ALI M5287" , UNIATA_SATA | UNIATA_NO_SLAVE ), PCI_DEV_HW_SPEC_BM( 5287, 10b9, 0x00, ATA_SA150, "ALI M5287" , UNIATA_SATA | UNIATA_NO_SLAVE ),
@ -455,10 +461,11 @@ BUSMASTER_CONTROLLER_INFORMATION const BusMasterAdapters[] = {
PCI_DEV_HW_SPEC_BM( 5229, 10b9, 0x20, ATA_UDMA2, "ALI M5229 UDMA2" , ALIOLD ), PCI_DEV_HW_SPEC_BM( 5229, 10b9, 0x20, ATA_UDMA2, "ALI M5229 UDMA2" , ALIOLD ),
PCI_DEV_HW_SPEC_BM( 5229, 10b9, 0x00, ATA_WDMA2, "ALI M5229 WDMA2" , ALIOLD ), PCI_DEV_HW_SPEC_BM( 5229, 10b9, 0x00, ATA_WDMA2, "ALI M5229 WDMA2" , ALIOLD ),
PCI_DEV_HW_SPEC_BM( 7409, 1022, 0x00, ATA_UDMA4, "AMD 756" , AMDNVIDIA | 0x00 ), PCI_DEV_HW_SPEC_BM( 7401, 1022, 0x00, ATA_UDMA2, "AMD 755" , AMDNVIDIA | 0x00 ),
PCI_DEV_HW_SPEC_BM( 7411, 1022, 0x00, ATA_UDMA5, "AMD 766" , AMDNVIDIA | AMDCABLE|AMDBUG ), PCI_DEV_HW_SPEC_BM( 7409, 1022, 0x00, ATA_UDMA4, "AMD 756" , AMDNVIDIA | UNIATA_NO80CHK ),
PCI_DEV_HW_SPEC_BM( 7441, 1022, 0x00, ATA_UDMA5, "AMD 768" , AMDNVIDIA | AMDCABLE ), PCI_DEV_HW_SPEC_BM( 7411, 1022, 0x00, ATA_UDMA5, "AMD 766" , AMDNVIDIA | AMDBUG ),
PCI_DEV_HW_SPEC_BM( 7469, 1022, 0x00, ATA_UDMA6, "AMD 8111" , AMDNVIDIA | AMDCABLE ), PCI_DEV_HW_SPEC_BM( 7441, 1022, 0x00, ATA_UDMA5, "AMD 768" , AMDNVIDIA ),
PCI_DEV_HW_SPEC_BM( 7469, 1022, 0x00, ATA_UDMA6, "AMD 8111" , AMDNVIDIA ),
PCI_DEV_HW_SPEC_BM( 4349, 1002, 0x00, ATA_UDMA5, "ATI IXP200" , 0 ), PCI_DEV_HW_SPEC_BM( 4349, 1002, 0x00, ATA_UDMA5, "ATI IXP200" , 0 ),
PCI_DEV_HW_SPEC_BM( 4369, 1002, 0x00, ATA_UDMA6, "ATI IXP300" , 0 ), PCI_DEV_HW_SPEC_BM( 4369, 1002, 0x00, ATA_UDMA6, "ATI IXP300" , 0 ),
@ -520,6 +527,10 @@ BUSMASTER_CONTROLLER_INFORMATION const BusMasterAdapters[] = {
PCI_DEV_HW_SPEC_BM( 2825, 8086, 0x00, ATA_SA300, "Intel ICH8" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2825, 8086, 0x00, ATA_SA300, "Intel ICH8" , UNIATA_SATA | UNIATA_AHCI ),
PCI_DEV_HW_SPEC_BM( 2829, 8086, 0x00, ATA_SA300, "Intel ICH8M" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2829, 8086, 0x00, ATA_SA300, "Intel ICH8M" , UNIATA_SATA | UNIATA_AHCI ),
PCI_DEV_HW_SPEC_BM( 282a, 8086, 0x00, ATA_SA300, "Intel ICH8M" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 282a, 8086, 0x00, ATA_SA300, "Intel ICH8M" , UNIATA_SATA | UNIATA_AHCI ),
PCI_DEV_HW_SPEC_BM( 2920, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ),
PCI_DEV_HW_SPEC_BM( 2926, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ),
PCI_DEV_HW_SPEC_BM( 2923, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ),
PCI_DEV_HW_SPEC_BM( 2922, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ),
// PCI_DEV_HW_SPEC_BM( 3200, 8086, 0x00, ATA_SA150, "Intel 31244" , UNIATA_SATA ), // PCI_DEV_HW_SPEC_BM( 3200, 8086, 0x00, ATA_SA150, "Intel 31244" , UNIATA_SATA ),
PCI_DEV_HW_SPEC_BM( 01bc, 10de, 0x00, ATA_UDMA5, "nVidia nForce" , AMDNVIDIA ), PCI_DEV_HW_SPEC_BM( 01bc, 10de, 0x00, ATA_UDMA5, "nVidia nForce" , AMDNVIDIA ),
@ -690,6 +701,8 @@ BUSMASTER_CONTROLLER_INFORMATION const BusMasterAdapters[] = {
PCI_DEV_HW_SPEC_BM( 8172, 1283, 0x00, ATA_UDMA2, "IT8172" , 0 ), PCI_DEV_HW_SPEC_BM( 8172, 1283, 0x00, ATA_UDMA2, "IT8172" , 0 ),
PCI_DEV_HW_SPEC_BM( 8212, 1283, 0x00, ATA_UDMA6, "IT8212F" , ITE_133 ), PCI_DEV_HW_SPEC_BM( 8212, 1283, 0x00, ATA_UDMA6, "IT8212F" , ITE_133 ),
PCI_DEV_HW_SPEC_BM( 0044, 169c, 0x00, ATA_UDMA2, "Netcell SR3000/5000", 0 ),
PCI_DEV_HW_SPEC_BM( 8013, 3388, 0x00, ATA_DMA, "HiNT VXII EIDE" , 0 ), PCI_DEV_HW_SPEC_BM( 8013, 3388, 0x00, ATA_DMA, "HiNT VXII EIDE" , 0 ),
// Terminator // Terminator

222
reactos/drivers/storage/ide/uniata/bsmaster.h
View file

@ -77,8 +77,6 @@ Revision History:
#define PCI_ADDRESS_IOMASK 0xfffffff0 #define PCI_ADDRESS_IOMASK 0xfffffff0
#define ATA_BM_OFFSET1 0x08 #define ATA_BM_OFFSET1 0x08
#define ATA_DMA_ENTRIES 256 /* PAGESIZE/2/sizeof(BM_DMA_ENTRY)*/
#define ATA_DMA_EOT 0x80000000
#define ATA_IOSIZE 0x08 #define ATA_IOSIZE 0x08
#define ATA_ALTOFFSET 0x206 /* alternate registers offset */ #define ATA_ALTOFFSET 0x206 /* alternate registers offset */
#define ATA_PCCARD_ALTOFFSET 0x0e /* do for PCCARD devices */ #define ATA_PCCARD_ALTOFFSET 0x0e /* do for PCCARD devices */
@ -87,6 +85,9 @@ Revision History:
#define ATA_PC98_BANKIOSIZE 0x01 #define ATA_PC98_BANKIOSIZE 0x01
#define ATA_MAX_LBA28 DEF_U64(0x0fffffff) #define ATA_MAX_LBA28 DEF_U64(0x0fffffff)
#define ATA_DMA_ENTRIES 256 /* PAGESIZE/2/sizeof(BM_DMA_ENTRY)*/
#define ATA_DMA_EOT 0x80000000
#define DEV_BSIZE 512 #define DEV_BSIZE 512
#define ATAPI_MAGIC_LSB 0x14 #define ATAPI_MAGIC_LSB 0x14
@ -348,6 +349,34 @@ typedef struct _IDE_SATA_REGISTERS {
#define IDX_MAX_REG (IDX_SATA_IO+IDX_SATA_IO_SZ) #define IDX_MAX_REG (IDX_SATA_IO+IDX_SATA_IO_SZ)
typedef union _AHCI_IS_REG {
struct {
ULONG DHRS:1;// Device to Host Register FIS Interrupt
ULONG PSS:1; // PIO Setup FIS Interrupt
ULONG DSS:1; // DMA Setup FIS Interrupt
ULONG SDBS:1;// Set Device Bits Interrupt
ULONG UFS:1; // Unknown FIS Interrupt
ULONG DPS:1; // Descriptor Processed
ULONG PCS:1; // Port Connect Change Status
ULONG DMPS:1;// Device Mechanical Presence Status
ULONG Reserved_8_21:14;
ULONG PRCS:1;// PhyRdy Change Status
ULONG IPMS:1;// Incorrect Port Multiplier Status
ULONG OFS:1; // Overflow Status
ULONG Reserved_25:1;
ULONG INFS:1;// Interface Non-fatal Error Status
ULONG IFS:1; // Interface Fatal Error Status
ULONG HBDS:1;// Host Bus Data Error Status
ULONG HBFS:1;// Host Bus Fatal Error Status
ULONG TFES:1;// Task File Error Status
ULONG CPDS:1;// Cold Port Detect Status
};
ULONG Reg;
} AHCI_IS_REG, *PAHCI_IS_REG;
typedef struct _IDE_AHCI_PORT_REGISTERS { typedef struct _IDE_AHCI_PORT_REGISTERS {
union { union {
struct { struct {
@ -366,31 +395,9 @@ typedef struct _IDE_AHCI_PORT_REGISTERS {
}; };
union { union {
ULONG Reg; // interrupt status ULONG IS_Reg; // interrupt status
struct { AHCI_IS_REG IS;
ULONG DHRS:1;// Device to Host Register FIS Interrupt };
ULONG PSS:1; // PIO Setup FIS Interrupt
ULONG DSS:1; // DMA Setup FIS Interrupt
ULONG SDBS:1;// Set Device Bits Interrupt
ULONG UFS:1; // Unknown FIS Interrupt
ULONG DPS:1; // Descriptor Processed
ULONG PCS:1; // Port Connect Change Status
ULONG DMPS:1;// Device Mechanical Presence Status
ULONG Reserved_8_21:14;
ULONG PRCS:1;// PhyRdy Change Status
ULONG IPMS:1;// Incorrect Port Multiplier Status
ULONG OFS:1; // Overflow Status
ULONG Reserved_25:1;
ULONG INFS:1;// Interface Non-fatal Error Status
ULONG IFS:1; // Interface Fatal Error Status
ULONG HBDS:1;// Host Bus Data Error Status
ULONG HBFS:1;// Host Bus Fatal Error Status
ULONG TFES:1;// Task File Error Status
ULONG CPDS:1;// Cold Port Detect Status
};
} IS;
union { union {
ULONG Reg; // interrupt enable ULONG Reg; // interrupt enable
@ -513,13 +520,19 @@ typedef struct _IDE_AHCI_PORT_REGISTERS {
} IDE_AHCI_PORT_REGISTERS, *PIDE_AHCI_PORT_REGISTERS; } IDE_AHCI_PORT_REGISTERS, *PIDE_AHCI_PORT_REGISTERS;
#define IDX_AHCI_P_IS (FIELD_OFFSET(IDE_AHCI_PORT_REGISTERS, IS))
#define IDX_AHCI_P_CI (FIELD_OFFSET(IDE_AHCI_PORT_REGISTERS, CI))
typedef struct _IDE_AHCI_PRD_ENTRY { typedef struct _IDE_AHCI_PRD_ENTRY {
union { union {
ULONG base; ULONG base;
ULONGLONG base64; ULONGLONG base64;
struct { struct {
ULONG DBA; ULONG DBA;
ULONG DBAU; union {
ULONG DBAU;
ULONG baseu;
};
}; };
}; };
ULONG Reserved1; ULONG Reserved1;
@ -530,6 +543,22 @@ typedef struct _IDE_AHCI_PRD_ENTRY {
} IDE_AHCI_PRD_ENTRY, *PIDE_AHCI_PRD_ENTRY; } IDE_AHCI_PRD_ENTRY, *PIDE_AHCI_PRD_ENTRY;
#define ATA_AHCI_DMA_ENTRIES (PAGE_SIZE/2/sizeof(IDE_AHCI_PRD_ENTRY)) /* 128 */
typedef struct _IDE_AHCI_CMD {
UCHAR cfis[64];
UCHAR acmd[32];
UCHAR Reserved[32];
IDE_AHCI_PRD_ENTRY prd_tab[ATA_AHCI_DMA_ENTRIES];
} IDE_AHCI_CMD, *PIDE_AHCI_CMD;
typedef struct _IDE_AHCI_CMD_LIST {
USHORT cmd_flags;
USHORT prd_length; /* PRD entries */
ULONG bytecount;
ULONGLONG cmd_table_phys; /* 128byte aligned */
} IDE_AHCI_CMD_LIST, *PIDE_AHCI_CMD_LIST;
#define IsBusMaster(pciData) \ #define IsBusMaster(pciData) \
( ((pciData)->Command & (PCI_ENABLE_BUS_MASTER/* | PCI_ENABLE_IO_SPACE*/)) == \ ( ((pciData)->Command & (PCI_ENABLE_BUS_MASTER/* | PCI_ENABLE_IO_SPACE*/)) == \
(PCI_ENABLE_BUS_MASTER/* | PCI_ENABLE_IO_SPACE*/)) (PCI_ENABLE_BUS_MASTER/* | PCI_ENABLE_IO_SPACE*/))
@ -545,31 +574,52 @@ typedef struct _IDE_AHCI_PRD_ENTRY {
//#define INT_Q_SIZE 32 //#define INT_Q_SIZE 32
#define MIN_REQ_TTL 4 #define MIN_REQ_TTL 4
struct _ATA_REQ; union _ATA_REQ;
typedef struct _ATA_REQ { typedef union _ATA_REQ {
// ULONG reqId; // serial // ULONG reqId; // serial
struct _ATA_REQ* next_req; struct {
struct _ATA_REQ* prev_req;
PSCSI_REQUEST_BLOCK Srb; // Current request on controller. union {
PUSHORT DataBuffer; // Data buffer pointer. struct {
ULONG WordsLeft; // Data words left. union _ATA_REQ* next_req;
ULONG TransferLength; // Originally requested transfer length union _ATA_REQ* prev_req;
LONGLONG lba;
ULONG bcount;
UCHAR retry; PSCSI_REQUEST_BLOCK Srb; // Current request on controller.
UCHAR ttl;
// UCHAR tag;
UCHAR Flags;
UCHAR ReqState;
PSCSI_REQUEST_BLOCK OriginalSrb; // Mechanism Status Srb Data PUSHORT DataBuffer; // Data buffer pointer.
ULONG WordsLeft; // Data words left.
ULONG TransferLength; // Originally requested transfer length
LONGLONG lba;
ULONG WordsTransfered;// Data words already transfered.
ULONG bcount;
ULONG dma_base; UCHAR retry;
BM_DMA_ENTRY dma_tab[ATA_DMA_ENTRIES]; UCHAR ttl;
// UCHAR tag;
UCHAR Flags;
UCHAR ReqState;
PSCSI_REQUEST_BLOCK OriginalSrb; // Mechanism Status Srb Data
ULONG dma_entries;
union {
ULONG dma_base;
ULONGLONG ahci_base64; // for AHCI
};
};
UCHAR padding_128b[128];
};
struct {
union {
BM_DMA_ENTRY dma_tab[ATA_DMA_ENTRIES];
IDE_AHCI_CMD ahci_cmd; // for AHCI
};
};
};
UCHAR padding_4kb[PAGE_SIZE];
} ATA_REQ, *PATA_REQ; } ATA_REQ, *PATA_REQ;
@ -588,6 +638,7 @@ typedef struct _ATA_REQ {
#define REQ_STATE_QUEUED 0x10 #define REQ_STATE_QUEUED 0x10
#define REQ_STATE_PREPARE_TO_TRANSFER 0x20 #define REQ_STATE_PREPARE_TO_TRANSFER 0x20
#define REQ_STATE_PREPARE_TO_NEXT 0x21
#define REQ_STATE_READY_TO_TRANSFER 0x30 #define REQ_STATE_READY_TO_TRANSFER 0x30
#define REQ_STATE_EXPECTING_INTR 0x40 #define REQ_STATE_EXPECTING_INTR 0x40
@ -724,7 +775,14 @@ typedef struct _HW_CHANNEL {
PVOID DB_IO; PVOID DB_IO;
ULONG DB_IO_PhAddr; ULONG DB_IO_PhAddr;
PUCHAR DmaBuffer; PUCHAR DmaBuffer;
//
PIDE_AHCI_CMD_LIST AHCI_CL;
ULONGLONG AHCI_CL_PhAddr;
PVOID AHCI_FIS; // is not actually used by UniATA now, but is required by AHCI controller
ULONGLONG AHCI_FIS_PhAddr;
// Note: in contrast to FBSD, we keep PRD and CMD item in AtaReq structure
#ifdef QUEUE_STATISTICS #ifdef QUEUE_STATISTICS
LONGLONG QueueStat[MAX_QUEUE_STAT]; LONGLONG QueueStat[MAX_QUEUE_STAT];
@ -732,7 +790,7 @@ typedef struct _HW_CHANNEL {
LONGLONG IntersectCount; LONGLONG IntersectCount;
LONGLONG TryReorderCount; LONGLONG TryReorderCount;
LONGLONG TryReorderHeadCount; LONGLONG TryReorderHeadCount;
LONGLONG TryReorderTailCount; // in-order requests LONGLONG TryReorderTailCount; /* in-order requests */
#endif //QUEUE_STATISTICS #endif //QUEUE_STATISTICS
//ULONG BaseMemAddress; //ULONG BaseMemAddress;
@ -800,13 +858,16 @@ typedef struct _HW_LU_EXTENSION {
ULONG opt_PreferedTransferMode; ULONG opt_PreferedTransferMode;
BOOLEAN opt_ReadCacheEnable; BOOLEAN opt_ReadCacheEnable;
BOOLEAN opt_WriteCacheEnable; BOOLEAN opt_WriteCacheEnable;
UCHAR opt_ReadOnly;
// padding // padding
BOOLEAN opt_reserved[2]; BOOLEAN opt_reserved[1];
struct _SBadBlockListItem* bbListDescr; struct _SBadBlockListItem* bbListDescr;
struct _SBadBlockRange* arrBadBlocks; struct _SBadBlockRange* arrBadBlocks;
ULONG nBadBlocks; ULONG nBadBlocks;
struct _HW_DEVICE_EXTENSION* DeviceExtension;
#ifdef IO_STATISTICS #ifdef IO_STATISTICS
LONGLONG ModeErrorCount[MAX_RETRIES]; LONGLONG ModeErrorCount[MAX_RETRIES];
@ -833,7 +894,7 @@ typedef struct _HW_DEVICE_EXTENSION {
ULONG FirstChannelToCheck; ULONG FirstChannelToCheck;
#if 1 #if 1
HW_LU_EXTENSION lun[IDE_MAX_LUN]; HW_LU_EXTENSION lun[IDE_MAX_LUN];
HW_CHANNEL chan[AHCI_MAX_PORT]; // IDE_MAX_CHAN HW_CHANNEL chan[AHCI_MAX_PORT/*IDE_MAX_CHAN*/];
#else #else
PHW_LU_EXTENSION lun; PHW_LU_EXTENSION lun;
PHW_CHANNEL chan; PHW_CHANNEL chan;
@ -851,12 +912,12 @@ typedef struct _HW_DEVICE_EXTENSION {
ULONG ActiveDpcChan; ULONG ActiveDpcChan;
ULONG FirstDpcChan; ULONG FirstDpcChan;
/*
// PHW_TIMER HwScsiTimer1; PHW_TIMER HwScsiTimer1;
// PHW_TIMER HwScsiTimer2; PHW_TIMER HwScsiTimer2;
// LONGLONG DpcTime1; LONGLONG DpcTime1;
// LONGLONG DpcTime2; LONGLONG DpcTime2;
*/
ULONG queue_depth; ULONG queue_depth;
PDEVICE_OBJECT Isr2DevObj; PDEVICE_OBJECT Isr2DevObj;
@ -891,6 +952,7 @@ typedef struct _HW_DEVICE_EXTENSION {
ULONG MaxTransferMode; // max transfer mode supported by controller ULONG MaxTransferMode; // max transfer mode supported by controller
ULONG HwFlags; ULONG HwFlags;
INTERFACE_TYPE OrigAdapterInterfaceType; INTERFACE_TYPE OrigAdapterInterfaceType;
INTERFACE_TYPE AdapterInterfaceType;
ULONG MaximumDmaTransferLength; ULONG MaximumDmaTransferLength;
ULONG AlignmentMask; ULONG AlignmentMask;
@ -908,6 +970,8 @@ typedef struct _HW_DEVICE_EXTENSION {
BOOLEAN opt_AtapiDmaRawRead; // default TRUE BOOLEAN opt_AtapiDmaRawRead; // default TRUE
BOOLEAN opt_AtapiDmaReadWrite; // default TRUE BOOLEAN opt_AtapiDmaReadWrite; // default TRUE
PCHAR FullDevName;
} HW_DEVICE_EXTENSION, *PHW_DEVICE_EXTENSION; } HW_DEVICE_EXTENSION, *PHW_DEVICE_EXTENSION;
typedef struct _ISR2_DEVICE_EXTENSION { typedef struct _ISR2_DEVICE_EXTENSION {
@ -921,6 +985,8 @@ typedef struct _ISR2_DEVICE_EXTENSION {
extern UCHAR pciBuffer[256]; extern UCHAR pciBuffer[256];
extern PBUSMASTER_CONTROLLER_INFORMATION BMList; extern PBUSMASTER_CONTROLLER_INFORMATION BMList;
extern ULONG BMListLen; extern ULONG BMListLen;
extern ULONG IsaCount;
extern ULONG MCACount;
//extern const CHAR retry_Wdma[MAX_RETRIES+1]; //extern const CHAR retry_Wdma[MAX_RETRIES+1];
//extern const CHAR retry_Udma[MAX_RETRIES+1]; //extern const CHAR retry_Udma[MAX_RETRIES+1];
@ -931,6 +997,26 @@ UniataEnumBusMasterController(
PVOID Argument2 PVOID Argument2
); );
extern ULONG DDKAPI
UniataFindCompatBusMasterController1(
IN PVOID HwDeviceExtension,
IN PVOID Context,
IN PVOID BusInformation,
IN PCHAR ArgumentString,
IN OUT PPORT_CONFIGURATION_INFORMATION ConfigInfo,
OUT PBOOLEAN Again
);
extern ULONG DDKAPI
UniataFindCompatBusMasterController2(
IN PVOID HwDeviceExtension,
IN PVOID Context,
IN PVOID BusInformation,
IN PCHAR ArgumentString,
IN OUT PPORT_CONFIGURATION_INFORMATION ConfigInfo,
OUT PBOOLEAN Again
);
extern ULONG DDKAPI extern ULONG DDKAPI
UniataFindBusMasterController( UniataFindBusMasterController(
IN PVOID HwDeviceExtension, IN PVOID HwDeviceExtension,
@ -941,6 +1027,16 @@ UniataFindBusMasterController(
OUT PBOOLEAN Again OUT PBOOLEAN Again
); );
extern ULONG DDKAPI
UniataFindFakeBusMasterController(
IN PVOID HwDeviceExtension,
IN PVOID Context,
IN PVOID BusInformation,
IN PCHAR ArgumentString,
IN OUT PPORT_CONFIGURATION_INFORMATION ConfigInfo,
OUT PBOOLEAN Again
);
extern NTSTATUS extern NTSTATUS
UniataConnectIntr2( UniataConnectIntr2(
IN PVOID HwDeviceExtension IN PVOID HwDeviceExtension
@ -962,6 +1058,9 @@ ScsiPortGetBusDataByOffset(
IN ULONG Length IN ULONG Length
); );
#define PCIBUSNUM_NOT_SPECIFIED (0xffffffffL)
#define PCISLOTNUM_NOT_SPECIFIED (0xffffffffL)
extern ULONG extern ULONG
AtapiFindListedDev( AtapiFindListedDev(
PBUSMASTER_CONTROLLER_INFORMATION BusMasterAdapters, PBUSMASTER_CONTROLLER_INFORMATION BusMasterAdapters,
@ -1021,8 +1120,6 @@ AtapiDmaStart(
IN PSCSI_REQUEST_BLOCK Srb IN PSCSI_REQUEST_BLOCK Srb
); );
//#define DEVNUM_NOT_SPECIFIED (0xffffffffL)
extern UCHAR extern UCHAR
AtapiDmaDone( AtapiDmaDone(
IN PVOID HwDeviceExtension, IN PVOID HwDeviceExtension,
@ -1327,6 +1424,8 @@ AtapiReadBuffer2(
chan->lun[1] = &(deviceExtension->lun[c*2+1]); \ chan->lun[1] = &(deviceExtension->lun[c*2+1]); \
chan->AltRegMap = deviceExtension->AltRegMap; \ chan->AltRegMap = deviceExtension->AltRegMap; \
chan->NextDpcChan = -1; \ chan->NextDpcChan = -1; \
chan->lun[0]->DeviceExtension = deviceExtension; \
chan->lun[1]->DeviceExtension = deviceExtension; \
} }
BOOLEAN BOOLEAN
@ -1336,6 +1435,11 @@ AtapiReadChipConfig(
IN ULONG channel // physical channel IN ULONG channel // physical channel
); );
VOID
UniataForgetDevice(
PHW_LU_EXTENSION LunExt
);
extern ULONG SkipRaids; extern ULONG SkipRaids;
extern ULONG ForceSimplex; extern ULONG ForceSimplex;
@ -1343,4 +1447,6 @@ extern BOOLEAN InDriverEntry;
extern BOOLEAN g_opt_Verbose; extern BOOLEAN g_opt_Verbose;
extern BOOLEAN WinVer_WDM_Model;
#endif //__IDE_BUSMASTER_H__ #endif //__IDE_BUSMASTER_H__

6
reactos/drivers/storage/ide/uniata/config.h
View file

@ -58,6 +58,12 @@
#define IO_STATISTICS #define IO_STATISTICS
/***************************************/
// Misc
/***************************************/
//#define NAVO_TEST
/***************************************************/ /***************************************************/
/* Validate Options */ /* Validate Options */
/***************************************************/ /***************************************************/

802
reactos/drivers/storage/ide/uniata/id_ata.cpp
View file

File diff suppressed because it is too large Load diff

145
reactos/drivers/storage/ide/uniata/id_dma.cpp
View file

@ -176,7 +176,24 @@ err_1:
} }
} }
#endif //USE_OWN_DMA #endif //USE_OWN_DMA
/*
if(deviceExtension->HwFlags & UNIATA_AHCI) {
chan->AHCI_CLP = MmAllocateContiguousMemory(sizeof(((PATA_REQ)NULL)->dma_tab), ph4gb);
if(chan->AHCI_CLP) {
chan->DB_PRD_PhAddr = AtapiVirtToPhysAddr(HwDeviceExtension, NULL, (PUCHAR)(chan->DB_PRD), &i, &ph_addru);
if(!chan->DB_PRD_PhAddr || !i || ((LONG)(chan->DB_PRD_PhAddr) == -1)) {
KdPrint2((PRINT_PREFIX "AtapiDmaAlloc: No DB PRD BASE\n" ));
chan->DB_PRD = NULL;
chan->DB_PRD_PhAddr = 0;
return;
}
if(ph_addru) {
KdPrint2((PRINT_PREFIX "AtapiDmaAlloc: No DB PRD below 4Gb\n" ));
goto err_1;
}
}
}
*/
return; return;
} // end AtapiDmaAlloc() } // end AtapiDmaAlloc()
@ -196,36 +213,45 @@ AtapiDmaSetup(
PHW_CHANNEL chan = &(deviceExtension->chan[lChannel]); PHW_CHANNEL chan = &(deviceExtension->chan[lChannel]);
PATA_REQ AtaReq = (PATA_REQ)(Srb->SrbExtension); PATA_REQ AtaReq = (PATA_REQ)(Srb->SrbExtension);
BOOLEAN use_DB_IO = FALSE; BOOLEAN use_DB_IO = FALSE;
BOOLEAN use_AHCI = FALSE;
ULONG orig_count = count; ULONG orig_count = count;
ULONG max_entries = (deviceExtension->HwFlags & UNIATA_AHCI) ? ATA_AHCI_DMA_ENTRIES : ATA_DMA_ENTRIES;
AtaReq->Flags &= ~REQ_FLAG_DMA_OPERATION; AtaReq->Flags &= ~REQ_FLAG_DMA_OPERATION;
KdPrint2((PRINT_PREFIX "AtapiDmaSetup: mode %#x\n", deviceExtension->lun[lChannel*2+DeviceNumber].TransferMode )); KdPrint2((PRINT_PREFIX "AtapiDmaSetup: mode %#x, data %x, count %x, lCh %x, dev %x\n",
deviceExtension->lun[lChannel*2+DeviceNumber].TransferMode,
data, count, lChannel, DeviceNumber ));
if(deviceExtension->lun[lChannel*2+DeviceNumber].TransferMode < ATA_DMA) { if(deviceExtension->lun[lChannel*2+DeviceNumber].TransferMode < ATA_DMA) {
KdPrint2((PRINT_PREFIX "AtapiDmaSetup: Not DMA mode, assume this is just preparation\n" )); KdPrint2((PRINT_PREFIX "AtapiDmaSetup: Not DMA mode, assume this is just preparation\n" ));
//return FALSE; //return FALSE;
} }
//KdPrint2((PRINT_PREFIX " checkpoint 1\n" ));
if(!count) { if(!count) {
KdPrint2((PRINT_PREFIX "AtapiDmaSetup: count=0\n" )); KdPrint2((PRINT_PREFIX "AtapiDmaSetup: count=0\n" ));
return FALSE; return FALSE;
} }
//KdPrint2((PRINT_PREFIX " checkpoint 2\n" ));
if(count > deviceExtension->MaximumDmaTransferLength) { if(count > deviceExtension->MaximumDmaTransferLength) {
KdPrint2((PRINT_PREFIX "AtapiDmaSetup: deviceExtension->MaximumDmaTransferLength > count\n" )); KdPrint2((PRINT_PREFIX "AtapiDmaSetup: deviceExtension->MaximumDmaTransferLength > count\n" ));
return FALSE; return FALSE;
} }
//KdPrint2((PRINT_PREFIX " checkpoint 3\n" ));
if((ULONG)data & deviceExtension->AlignmentMask) { if((ULONG)data & deviceExtension->AlignmentMask) {
KdPrint2((PRINT_PREFIX "AtapiDmaSetup: unaligned data: %#x (%#x)\n", data, deviceExtension->AlignmentMask)); KdPrint2((PRINT_PREFIX "AtapiDmaSetup: unaligned data: %#x (%#x)\n", data, deviceExtension->AlignmentMask));
return FALSE; return FALSE;
} }
// NOTE: This code is intended for 32-bit capable controllers only. //KdPrint2((PRINT_PREFIX " checkpoint 4\n" ));
// 64-bit capable controllers shall be handled separately. KdPrint2((PRINT_PREFIX " get Phys(PRD=%x)\n", &(AtaReq->dma_tab) ));
dma_base = AtapiVirtToPhysAddr(HwDeviceExtension, NULL, (PUCHAR)&(AtaReq->dma_tab) /*chan->dma_tab*/, &i, &dma_baseu); dma_base = AtapiVirtToPhysAddr(HwDeviceExtension, NULL, (PUCHAR)&(AtaReq->dma_tab) /*chan->dma_tab*/, &i, &dma_baseu);
if(dma_baseu) { if(dma_baseu) {
KdPrint2((PRINT_PREFIX "AtapiDmaSetup: SRB built-in PRD above 4Gb: %8.8x%8.8x\n", dma_baseu, dma_base)); KdPrint2((PRINT_PREFIX "AtapiDmaSetup: SRB built-in PRD above 4Gb: %8.8x%8.8x\n", dma_baseu, dma_base));
dma_base = chan->DB_PRD_PhAddr; if(!deviceExtension->Host64) {
AtaReq->Flags |= REQ_FLAG_DMA_DBUF_PRD; dma_base = chan->DB_PRD_PhAddr;
i = 1; AtaReq->Flags |= REQ_FLAG_DMA_DBUF_PRD;
i = 1;
}
} else } else
if(!dma_base || !i || ((LONG)(dma_base) == -1)) { if(!dma_base || !i || ((LONG)(dma_base) == -1)) {
KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No BASE\n" )); KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No BASE\n" ));
@ -233,17 +259,23 @@ AtapiDmaSetup(
} }
AtaReq->dma_base = dma_base; AtaReq->dma_base = dma_base;
KdPrint2((PRINT_PREFIX " get Phys(data=%x)\n", data ));
dma_base = AtapiVirtToPhysAddr(HwDeviceExtension, Srb, data, &dma_count, &dma_baseu); dma_base = AtapiVirtToPhysAddr(HwDeviceExtension, Srb, data, &dma_count, &dma_baseu);
if(dma_baseu) { if(dma_baseu) {
KdPrint2((PRINT_PREFIX "AtapiDmaSetup: 1st block of buffer above 4Gb: %8.8x%8.8x\n", dma_baseu, dma_base)); KdPrint2((PRINT_PREFIX "AtapiDmaSetup: 1st block of buffer above 4Gb: %8.8x%8.8x\n", dma_baseu, dma_base));
if(!deviceExtension->Host64) {
retry_DB_IO: retry_DB_IO:
use_DB_IO = TRUE; use_DB_IO = TRUE;
dma_base = chan->DB_IO_PhAddr; dma_base = chan->DB_IO_PhAddr;
data = (PUCHAR)(chan->DB_IO); data = (PUCHAR)(chan->DB_IO);
} else {
AtaReq->ahci_base64 = (ULONGLONG)dma_base | ((ULONGLONG)dma_baseu << 32);
}
} else } else
if(!dma_count || ((LONG)(dma_base) == -1)) { if(!dma_count || ((LONG)(dma_base) == -1)) {
AtaReq->dma_base = 0;
KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No 1st block\n" )); KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No 1st block\n" ));
//AtaReq->dma_base = NULL;
AtaReq->ahci_base64 = NULL;
return FALSE; return FALSE;
} }
@ -253,26 +285,37 @@ retry_DB_IO:
i = 0; i = 0;
while (count) { while (count) {
AtaReq->dma_tab[i].base = dma_base; if(deviceExtension->HwFlags & UNIATA_AHCI) {
AtaReq->dma_tab[i].count = (dma_count & 0xffff); AtaReq->ahci_cmd.prd_tab[i].base = dma_base;
i++; AtaReq->ahci_cmd.prd_tab[i].baseu = dma_baseu;
if (i >= ATA_DMA_ENTRIES) { AtaReq->ahci_cmd.prd_tab[i].DBC = ((dma_count-1) & 0x3fffff);
AtaReq->dma_base = 0; } else {
AtaReq->dma_tab[i].base = dma_base;
AtaReq->dma_tab[i].count = (dma_count & 0xffff);
}
i++;
if (i >= max_entries) {
KdPrint2((PRINT_PREFIX "too many segments in DMA table\n" )); KdPrint2((PRINT_PREFIX "too many segments in DMA table\n" ));
//AtaReq->dma_base = NULL;
AtaReq->ahci_base64 = NULL;
return FALSE; return FALSE;
} }
KdPrint2((PRINT_PREFIX " get Phys(data[n]=%x)\n", data ));
dma_base = AtapiVirtToPhysAddr(HwDeviceExtension, Srb, data, &dma_count, &dma_baseu); dma_base = AtapiVirtToPhysAddr(HwDeviceExtension, Srb, data, &dma_count, &dma_baseu);
if(dma_baseu) { if(dma_baseu) {
KdPrint2((PRINT_PREFIX "AtapiDmaSetup: block of buffer above 4Gb: %8.8x%8.8x\n", dma_baseu, dma_base)); KdPrint2((PRINT_PREFIX "AtapiDmaSetup: block of buffer above 4Gb: %8.8x%8.8x\n", dma_baseu, dma_base));
if(use_DB_IO) { if(!deviceExtension->Host64) {
KdPrint2((PRINT_PREFIX "AtapiDmaSetup: *ERROR* special buffer above 4Gb: %8.8x%8.8x\n", dma_baseu, dma_base)); if(use_DB_IO) {
return FALSE; KdPrint2((PRINT_PREFIX "AtapiDmaSetup: *ERROR* special buffer above 4Gb: %8.8x%8.8x\n", dma_baseu, dma_base));
return FALSE;
}
count = orig_count;
goto retry_DB_IO;
} }
count = orig_count;
goto retry_DB_IO;
} else } else
if(!dma_count || !dma_base || ((LONG)(dma_base) == -1)) { if(!dma_count || !dma_base || ((LONG)(dma_base) == -1)) {
AtaReq->dma_base = 0; //AtaReq->dma_base = NULL;
AtaReq->ahci_base64 = NULL;
KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No NEXT block\n" )); KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No NEXT block\n" ));
return FALSE; return FALSE;
} }
@ -281,8 +324,16 @@ retry_DB_IO:
data += min(count, PAGE_SIZE); data += min(count, PAGE_SIZE);
count -= min(count, PAGE_SIZE); count -= min(count, PAGE_SIZE);
} }
AtaReq->dma_tab[i].base = dma_base; KdPrint2((PRINT_PREFIX " set TERM\n" ));
AtaReq->dma_tab[i].count = (dma_count & 0xffff) | ATA_DMA_EOT; if(deviceExtension->HwFlags & UNIATA_AHCI) {
AtaReq->ahci_cmd.prd_tab[i].base = dma_base;
AtaReq->ahci_cmd.prd_tab[i].baseu = dma_baseu;
AtaReq->ahci_cmd.prd_tab[i].DBC = ((dma_count-1) & 0x3fffff);
} else {
AtaReq->dma_tab[i].base = dma_base;
AtaReq->dma_tab[i].count = (dma_count & 0xffff) | ATA_DMA_EOT;
}
AtaReq->dma_entries = i;
if(use_DB_IO) { if(use_DB_IO) {
AtaReq->Flags |= REQ_FLAG_DMA_DBUF; AtaReq->Flags |= REQ_FLAG_DMA_DBUF;
@ -405,7 +456,11 @@ AtapiDmaStart(
if(AtaReq->Flags & REQ_FLAG_DMA_DBUF_PRD) { if(AtaReq->Flags & REQ_FLAG_DMA_DBUF_PRD) {
KdPrint2((PRINT_PREFIX " DBUF_PRD\n")); KdPrint2((PRINT_PREFIX " DBUF_PRD\n"));
ASSERT(FALSE); ASSERT(FALSE);
RtlCopyMemory(chan->DB_PRD, &(AtaReq->dma_tab), sizeof(AtaReq->dma_tab)); if(deviceExtension->HwFlags & UNIATA_AHCI) {
RtlCopyMemory(chan->DB_PRD, &(AtaReq->ahci_cmd), sizeof(AtaReq->ahci_cmd));
} else {
RtlCopyMemory(chan->DB_PRD, &(AtaReq->dma_tab), sizeof(AtaReq->dma_tab));
}
} }
if(!(Srb->SrbFlags & SRB_FLAGS_DATA_IN) && if(!(Srb->SrbFlags & SRB_FLAGS_DATA_IN) &&
(AtaReq->Flags & REQ_FLAG_DMA_DBUF)) { (AtaReq->Flags & REQ_FLAG_DMA_DBUF)) {
@ -567,16 +622,25 @@ limit_lba48:
LunExt->DeviceFlags |= REQ_FLAG_FORCE_DOWNRATE_LBA48; LunExt->DeviceFlags |= REQ_FLAG_FORCE_DOWNRATE_LBA48;
limit_pio: limit_pio:
// do not make extra work if we already use PIO // do not make extra work if we already use PIO
KdPrint2((PRINT_PREFIX
"AtapiDmaReinit: set PIO mode on Device %d (%x -> %x)\n", ldev & 1, LunExt->TransferMode, ATA_PIO0+apiomode));
if(/*LunExt->TransferMode >= ATA_DMA*/ if(/*LunExt->TransferMode >= ATA_DMA*/
LunExt->TransferMode != ATA_PIO0+apiomode (LunExt->TransferMode > ATA_PIO5) && (LunExt->TransferMode != ATA_PIO0+apiomode)
) { ) {
KdPrint2((PRINT_PREFIX
"AtapiDmaReinit: set PIO mode on Device %d (%x -> %x)\n", ldev & 1, LunExt->TransferMode, ATA_PIO0+apiomode));
AtapiDmaInit(deviceExtension, ldev & 1, ldev >> 1, AtapiDmaInit(deviceExtension, ldev & 1, ldev >> 1,
apiomode, apiomode,
-1, -1,
-1 ); -1 );
} else
if(LunExt->LimitedTransferMode < LunExt->TransferMode) {
KdPrint2((PRINT_PREFIX
"AtapiDmaReinit: set PIO mode on Device %d (%x -> %x) (2)\n", ldev & 1, LunExt->TransferMode, LunExt->LimitedTransferMode));
AtapiDmaInit(deviceExtension, ldev & 1, ldev >> 1,
LunExt->LimitedTransferMode-ATA_PIO0,
-1,
-1 );
} }
} else { } else {
KdPrint2((PRINT_PREFIX KdPrint2((PRINT_PREFIX
"AtapiDmaReinit: set MAX mode on Device %d\n", ldev & 1)); "AtapiDmaReinit: set MAX mode on Device %d\n", ldev & 1));
@ -653,23 +717,23 @@ AtaSetTransferMode(
IDE_COMMAND_SET_FEATURES, 0, 0, 0, IDE_COMMAND_SET_FEATURES, 0, 0, 0,
(UCHAR)((mode > ATA_UDMA6) ? ATA_UDMA6 : mode), ATA_C_F_SETXFER, ATA_WAIT_BASE_READY); (UCHAR)((mode > ATA_UDMA6) ? ATA_UDMA6 : mode), ATA_C_F_SETXFER, ATA_WAIT_BASE_READY);
if(statusByte & IDE_STATUS_ERROR) { if(statusByte & IDE_STATUS_ERROR) {
KdPrint2((PRINT_PREFIX " wait ready after error\n")); KdPrint3((PRINT_PREFIX " wait ready after error\n"));
if(LunExt->DeviceFlags & DFLAGS_ATAPI_DEVICE) { if(LunExt->DeviceFlags & DFLAGS_ATAPI_DEVICE) {
AtapiStallExecution(10); AtapiStallExecution(10);
} else { } else {
AtapiStallExecution(100); AtapiStallExecution(100);
} }
apiomode = (CHAR)AtaPioMode(&(LunExt->IdentifyData)); apiomode = (CHAR)AtaPioMode(&(LunExt->IdentifyData));
if( apiomode > 0 && if( (apiomode > 0) &&
(CHAR)AtaWmode(&(LunExt->IdentifyData)) > 0 && ((CHAR)AtaWmode(&(LunExt->IdentifyData)) > 0) &&
(CHAR)AtaUmode(&(LunExt->IdentifyData)) > 0 ((CHAR)AtaUmode(&(LunExt->IdentifyData)) > 0)
) { ) {
return FALSE; return FALSE;
} }
if(mode > ATA_PIO2) { if(mode > ATA_PIO2) {
return FALSE; return FALSE;
} }
KdPrint2((PRINT_PREFIX " assume that drive doesn't support mode swithingm using PIO%d\n", apiomode)); KdPrint3((PRINT_PREFIX " assume that drive doesn't support mode swithing using PIO%d\n", apiomode));
mode = ATA_PIO0 + apiomode; mode = ATA_PIO0 + apiomode;
} }
//if(mode <= ATA_UDMA6) { //if(mode <= ATA_UDMA6) {
@ -780,7 +844,7 @@ AtapiDmaInit(
goto try_generic_dma; goto try_generic_dma;
} }
if(deviceExtension->BaseIoAddressSATA_0.Addr) { if(UniataIsSATARangeAvailable(deviceExtension, lChannel)) {
//if(ChipFlags & UNIATA_SATA) { //if(ChipFlags & UNIATA_SATA) {
/****************/ /****************/
/* SATA Generic */ /* SATA Generic */
@ -1060,6 +1124,17 @@ set_new_acard:
} }
/* Use GENERIC PIO */ /* Use GENERIC PIO */
break; break;
case ATA_NETCELL_ID:
/***********/
/* NetCell */
/***********/
if (wdmamode >= 2 && apiomode >= 4) {
if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_WDMA2)) {
return;
}
}
/* Use GENERIC PIO */
break;
case ATA_HIGHPOINT_ID: { case ATA_HIGHPOINT_ID: {
/********************/ /********************/
/* High Point (HPT) */ /* High Point (HPT) */
@ -1184,6 +1259,7 @@ set_new_acard:
if(ChipFlags & ICH4_FIX) { if(ChipFlags & ICH4_FIX) {
return; return;
} }
break;
} }
} }
} }
@ -1978,3 +2054,4 @@ via82c_timing(
SetPciConfig1(0x4b-dev, (FIT(active - 1, 0, 0xf) << 4) | FIT(recover - 1, 0, 0xf) ); SetPciConfig1(0x4b-dev, (FIT(active - 1, 0, 0xf) << 4) | FIT(recover - 1, 0, 0xf) );
} // end via82c_timing() } // end via82c_timing()

6
reactos/drivers/storage/ide/uniata/id_init.cpp
View file

@ -213,7 +213,7 @@ UniataChipDetect(
case 0x06401095: /* CMD 640 known bad, no DMA */ case 0x06401095: /* CMD 640 known bad, no DMA */
case 0x06011039: case 0x06011039:
*simplexOnly = TRUE; *simplexOnly = TRUE;
/* FALLTHROUGH */ /* FALLTHROUGH */
@ -244,7 +244,7 @@ UniataChipDetect(
i = Ata_is_dev_listed(DevTypeInfo, VendorID, DeviceID, RevID, -1); i = Ata_is_dev_listed(DevTypeInfo, VendorID, DeviceID, RevID, -1);
for_ugly_chips: for_ugly_chips:
KdPrint2((PRINT_PREFIX "i: %#x\n", i)); KdPrint2((PRINT_PREFIX "i: %#x\n", i));
if(i == 0xFFFFFFFF) { if(i == BMLIST_TERMINATOR) {
return FALSE; return FALSE;
} }
deviceExtension->MaxTransferMode = DevTypeInfo[i].MaxTransferMode; deviceExtension->MaxTransferMode = DevTypeInfo[i].MaxTransferMode;
@ -556,7 +556,7 @@ for_ugly_chips:
tmp32 == ATA_SIS5517) { tmp32 == ATA_SIS5517) {
i = AtapiFindListedDev((BUSMASTER_CONTROLLER_INFORMATION*)&SiSSouthAdapters[0], i = AtapiFindListedDev((BUSMASTER_CONTROLLER_INFORMATION*)&SiSSouthAdapters[0],
-1, HwDeviceExtension, SystemIoBusNumber, -1, NULL); -1, HwDeviceExtension, SystemIoBusNumber, -1, NULL);
if(i != 0xFFFFFFFF) { if(i != BMLIST_TERMINATOR) {
deviceExtension->HwFlags = (deviceExtension->HwFlags & ~CHIPTYPE_MASK) | SIS133OLD; deviceExtension->HwFlags = (deviceExtension->HwFlags & ~CHIPTYPE_MASK) | SIS133OLD;
//deviceExtension->MaxTransferMode = ATA_UDMA6; //deviceExtension->MaxTransferMode = ATA_UDMA6;
deviceExtension->MaxTransferMode = SiSSouthAdapters[i].MaxTransferMode; deviceExtension->MaxTransferMode = SiSSouthAdapters[i].MaxTransferMode;

736
reactos/drivers/storage/ide/uniata/id_probe.cpp
View file

File diff suppressed because it is too large Load diff

2
reactos/drivers/storage/ide/uniata/id_queue.cpp
View file

@ -350,7 +350,7 @@ UniataGetNextChannel(
cost_c = chan->queue_depth * (chan->ChannelSelectWaitCount+1); cost_c = chan->queue_depth * (chan->ChannelSelectWaitCount+1);
} }
} }
if(best_c == 0xFFFFFFFF) { if(best_c == CHAN_NOT_SPECIFIED) {
KdPrint2((PRINT_PREFIX " empty queues\n")); KdPrint2((PRINT_PREFIX " empty queues\n"));
return NULL; return NULL;
} }

134
reactos/drivers/storage/ide/uniata/id_sata.cpp
View file

@ -19,7 +19,7 @@ UniataSataConnect(
KdPrint2((PRINT_PREFIX "UniataSataConnect:\n")); KdPrint2((PRINT_PREFIX "UniataSataConnect:\n"));
if(!deviceExtension->BaseIoAddressSATA_0.Addr) { if(!UniataIsSATARangeAvailable(deviceExtension, lChannel)) {
KdPrint2((PRINT_PREFIX " no I/O range\n")); KdPrint2((PRINT_PREFIX " no I/O range\n"));
return IDE_STATUS_IDLE; return IDE_STATUS_IDLE;
} }
@ -73,7 +73,7 @@ UniataSataPhyEnable(
KdPrint2((PRINT_PREFIX "UniataSataPhyEnable:\n")); KdPrint2((PRINT_PREFIX "UniataSataPhyEnable:\n"));
if(!deviceExtension->BaseIoAddressSATA_0.Addr) { if(!UniataIsSATARangeAvailable(deviceExtension, lChannel)) {
KdPrint2((PRINT_PREFIX " no I/O range\n")); KdPrint2((PRINT_PREFIX " no I/O range\n"));
return IDE_STATUS_IDLE; return IDE_STATUS_IDLE;
} }
@ -130,7 +130,7 @@ UniataSataClearErr(
SATA_SSTATUS_REG SStatus; SATA_SSTATUS_REG SStatus;
SATA_SERROR_REG SError; SATA_SERROR_REG SError;
if(deviceExtension->BaseIoAddressSATA_0.Addr) { if(UniataIsSATARangeAvailable(deviceExtension, lChannel)) {
//if(ChipFlags & UNIATA_SATA) { //if(ChipFlags & UNIATA_SATA) {
SStatus.Reg = AtapiReadPort4(chan, IDX_SATA_SStatus); SStatus.Reg = AtapiReadPort4(chan, IDX_SATA_SStatus);
@ -172,7 +172,7 @@ UniataSataEvent(
UCHAR Status; UCHAR Status;
ULONG ldev = lChannel*2; ULONG ldev = lChannel*2;
if(!deviceExtension->BaseIoAddressSATA_0.Addr) { if(!UniataIsSATARangeAvailable(deviceExtension, lChannel)) {
return FALSE; return FALSE;
} }
@ -189,7 +189,7 @@ UniataSataEvent(
break; break;
case UNIATA_SATA_EVENT_DETACH: case UNIATA_SATA_EVENT_DETACH:
KdPrint2((PRINT_PREFIX " DISCONNECTED\n")); KdPrint2((PRINT_PREFIX " DISCONNECTED\n"));
deviceExtension->lun[ldev].DeviceFlags = 0; UniataForgetDevice(&(deviceExtension->lun[ldev]));
return TRUE; return TRUE;
break; break;
} }
@ -287,3 +287,127 @@ UniataAhciInit(
return TRUE; return TRUE;
} // end UniataAhciInit() } // end UniataAhciInit()
UCHAR
UniataAhciStatus(
IN PVOID HwDeviceExtension,
IN ULONG lChannel
)
{
PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension;
PHW_CHANNEL chan = &deviceExtension->chan[lChannel];
ULONG Channel = deviceExtension->Channel + lChannel;
ULONG hIS;
ULONG CI;
AHCI_IS_REG IS;
SATA_SSTATUS_REG SStatus;
SATA_SERROR_REG SError;
ULONG offs = sizeof(IDE_AHCI_REGISTERS) + Channel*sizeof(IDE_AHCI_PORT_REGISTERS);
ULONG base;
ULONG tag=0;
KdPrint(("UniataAhciStatus:\n"));
hIS = AtapiReadPortEx4(NULL, (ULONG)&deviceExtension->BaseIoAHCI_0, IDX_AHCI_IS);
KdPrint((" hIS %x\n", hIS));
hIS &= (1 << Channel);
if(!hIS) {
return 0;
}
base = (ULONG)&deviceExtension->BaseIoAHCI_0 + offs;
IS.Reg = AtapiReadPort4(chan, base + IDX_AHCI_P_IS);
CI = AtapiReadPort4(chan, base + IDX_AHCI_P_CI);
SStatus.Reg = AtapiReadPort4(chan, IDX_SATA_SStatus);
SError.Reg = AtapiReadPort4(chan, IDX_SATA_SError);
/* clear interrupt(s) */
AtapiWritePortEx4(NULL, (ULONG)&deviceExtension->BaseIoAHCI_0, IDX_AHCI_IS, hIS);
AtapiWritePort4(chan, base + IDX_AHCI_P_IS, IS.Reg);
AtapiWritePort4(chan, IDX_SATA_SError, SError.Reg);
KdPrint((" AHCI: status=%08x sstatus=%08x error=%08x CI=%08x\n",
IS.Reg, SStatus.Reg, SError.Reg, CI));
/* do we have cold connect surprise */
if(IS.CPDS) {
}
/* check for and handle connect events */
if(IS.PCS) {
UniataSataEvent(HwDeviceExtension, lChannel, UNIATA_SATA_EVENT_ATTACH);
}
if(IS.PRCS) {
UniataSataEvent(HwDeviceExtension, lChannel, UNIATA_SATA_EVENT_DETACH);
}
if(CI & (1 << tag)) {
return 1;
}
KdPrint((" AHCI: unexpected\n"));
return 2;
} // end UniataAhciStatus()
ULONG
UniataAhciSetupFIS(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG DeviceNumber,
IN ULONG lChannel,
OUT PUCHAR fis,
IN UCHAR command,
IN ULONGLONG lba,
IN USHORT count,
IN USHORT feature,
IN ULONG flags
)
{
ULONG ldev = lChannel*2 + DeviceNumber;
ULONG i;
PUCHAR plba;
KdPrint2((PRINT_PREFIX " AHCI setup FIS\n" ));
i = 0;
plba = (PUCHAR)&lba;
/* translate command into 48bit version */
if ((lba >= ATA_MAX_LBA28 || count > 256) &&
deviceExtension->lun[ldev].IdentifyData.FeaturesSupport.Address48) {
if(AtaCommandFlags[command] & ATA_CMD_FLAG_48supp) {
command = AtaCommands48[command];
} else {
KdPrint2((PRINT_PREFIX " unhandled LBA48 command\n"));
return 0;
}
}
fis[i++] = 0x27; /* host to device */
fis[i++] = 0x80; /* command FIS (note PM goes here) */
fis[i++] = command;
fis[i++] = (UCHAR)feature;
fis[i++] = plba[0];
fis[i++] = plba[1];
fis[i++] = plba[2];
fis[i] = IDE_USE_LBA | (DeviceNumber ? IDE_DRIVE_2 : IDE_DRIVE_1);
if ((lba >= ATA_MAX_LBA28 || count > 256) &&
deviceExtension->lun[ldev].IdentifyData.FeaturesSupport.Address48) {
i++;
} else {
fis[i++] |= (plba[3] >> 24) & 0x0f;
}
fis[i++] = plba[3];
fis[i++] = plba[4];
fis[i++] = plba[5];
fis[i++] = (UCHAR)(feature>>8) & 0xff;
fis[i++] = (UCHAR)count & 0xff;
fis[i++] = (UCHAR)(count>>8) & 0xff;
fis[i++] = 0x00;
fis[i++] = IDE_DC_A_4BIT;
fis[i++] = 0x00;
fis[i++] = 0x00;
fis[i++] = 0x00;
fis[i++] = 0x00;
return i;
} // end UniataAhciSetupFIS()

29
reactos/drivers/storage/ide/uniata/id_sata.h
View file

@ -33,4 +33,33 @@ UniataSataEvent(
IN ULONG Action IN ULONG Action
); );
#define UniataIsSATARangeAvailable(deviceExtension, lChannel) \
((deviceExtension->BaseIoAddressSATA_0.Addr || \
deviceExtension->BaseIoAHCI_0.Addr) && \
(deviceExtension->chan[lChannel].RegTranslation[IDX_SATA_SStatus].Addr))
BOOLEAN
UniataAhciInit(
IN PVOID HwDeviceExtension
);
UCHAR
UniataAhciStatus(
IN PVOID HwDeviceExtension,
IN ULONG lChannel
);
ULONG
UniataAhciSetupFIS(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG DeviceNumber,
IN ULONG lChannel,
OUT PUCHAR fis,
IN UCHAR command,
IN ULONGLONG lba,
IN USHORT count,
IN USHORT feature,
IN ULONG flags
);
#endif //__UNIATA_SATA__H__ #endif //__UNIATA_SATA__H__

2
reactos/drivers/storage/ide/uniata/idedma.rc
View file

@ -1,6 +1,6 @@
#include "uniata_ver.h" #include "uniata_ver.h"
#define VERSION 0,38,2,0 #define VERSION 0,39,6,0
#define VERSION_STR "0." UNIATA_VER_STR #define VERSION_STR "0." UNIATA_VER_STR
#define REACTOS_FILETYPE VFT_DRV #define REACTOS_FILETYPE VFT_DRV

29
reactos/drivers/storage/ide/uniata/ntddk_ex.h
View file

@ -1,16 +1,20 @@
#ifndef __NTDDK_EX__H__ #ifndef __NTDDK_EX__H__
#define __NTDDK_EX__H__ #define __NTDDK_EX__H__
#ifndef __REACTOS__
#undef ASSERT #undef ASSERT
#define ASSERT #define ASSERT
#else
#undef ASSERT
#define ASSERT //(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); }
#endif //__REACTOS__
typedef enum _SYSTEM_INFORMATION_CLASS typedef enum _SYSTEM_INFORMATION_CLASS {
{
SystemBasicInformation, SystemBasicInformation,
SystemProcessorInformation, SystemProcessorInformation,
SystemPerformanceInformation, SystemPerformanceInformation,
SystemTimeOfDayInformation, SystemTimeOfDayInformation,
SystemPathInformation, /// Obsolete: Use KUSER_SHARED_DATA SystemPathInformation,
SystemProcessInformation, SystemProcessInformation,
SystemCallCountInformation, SystemCallCountInformation,
SystemDeviceInformation, SystemDeviceInformation,
@ -36,9 +40,15 @@ typedef enum _SYSTEM_INFORMATION_CLASS
SystemUnloadGdiDriverInformation, SystemUnloadGdiDriverInformation,
SystemTimeAdjustmentInformation, SystemTimeAdjustmentInformation,
SystemSummaryMemoryInformation, SystemSummaryMemoryInformation,
#ifndef __REACTOS__
SystemNextEventIdInformation,
SystemEventIdsInformation,
SystemCrashDumpInformation,
#else
SystemMirrorMemoryInformation, SystemMirrorMemoryInformation,
SystemPerformanceTraceInformation, SystemPerformanceTraceInformation,
SystemObsolete0, SystemObsolete0,
#endif
SystemExceptionInformation, SystemExceptionInformation,
SystemCrashDumpStateInformation, SystemCrashDumpStateInformation,
SystemKernelDebuggerInformation, SystemKernelDebuggerInformation,
@ -48,10 +58,17 @@ typedef enum _SYSTEM_INFORMATION_CLASS
SystemPrioritySeperation, SystemPrioritySeperation,
SystemPlugPlayBusInformation, SystemPlugPlayBusInformation,
SystemDockInformation, SystemDockInformation,
#ifdef __REACTOS__
SystemPowerInformationNative, SystemPowerInformationNative,
#elif defined IRP_MN_START_DEVICE
SystemPowerInformationInfo,
#else
SystemPowerInformation,
#endif
SystemProcessorSpeedInformation, SystemProcessorSpeedInformation,
SystemCurrentTimeZoneInformation, SystemCurrentTimeZoneInformation,
SystemLookasideInformation, SystemLookasideInformation,
#ifdef __REACTOS__
SystemTimeSlipNotification, SystemTimeSlipNotification,
SystemSessionCreate, SystemSessionCreate,
SystemSessionDetach, SystemSessionDetach,
@ -105,8 +122,10 @@ typedef enum _SYSTEM_INFORMATION_CLASS
SystemPrefetchPathInformation, SystemPrefetchPathInformation,
SystemVerifierFaultsInformation, SystemVerifierFaultsInformation,
MaxSystemInfoClass, MaxSystemInfoClass,
#endif //__REACTOS__
} SYSTEM_INFORMATION_CLASS; } SYSTEM_INFORMATION_CLASS;
NTSYSAPI NTSYSAPI
NTSTATUS NTSTATUS
NTAPI NTAPI
@ -161,7 +180,9 @@ typedef struct _SYSTEM_MODULE_INFORMATION
} SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION; } SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION;
typedef unsigned short WORD; typedef unsigned short WORD;
//typedef unsigned int BOOL; #ifndef __REACTOS__
typedef unsigned int BOOL;
#endif //__REACTOS__
typedef unsigned long DWORD; typedef unsigned long DWORD;
typedef unsigned char BYTE; typedef unsigned char BYTE;

36
reactos/drivers/storage/ide/uniata/srb.h
View file

@ -423,39 +423,39 @@ typedef struct _SCSI_WMI_REQUEST_BLOCK {
// //
typedef typedef
BOOLEAN DDKAPI BOOLEAN
(*PHW_INITIALIZE) ( (DDKAPI *PHW_INITIALIZE) (
IN PVOID DeviceExtension IN PVOID DeviceExtension
); );
typedef typedef
BOOLEAN DDKAPI BOOLEAN
(*PHW_STARTIO) ( (DDKAPI *PHW_STARTIO) (
IN PVOID DeviceExtension, IN PVOID DeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb IN PSCSI_REQUEST_BLOCK Srb
); );
typedef typedef
BOOLEAN DDKAPI BOOLEAN
(*PHW_INTERRUPT) ( (DDKAPI *PHW_INTERRUPT) (
IN PVOID DeviceExtension IN PVOID DeviceExtension
); );
typedef typedef
VOID DDKAPI VOID
(*PHW_TIMER) ( (DDKAPI *PHW_TIMER) (
IN PVOID DeviceExtension IN PVOID DeviceExtension
); );
typedef typedef
VOID DDKAPI VOID
(*PHW_DMA_STARTED) ( (DDKAPI *PHW_DMA_STARTED) (
IN PVOID DeviceExtension IN PVOID DeviceExtension
); );
typedef typedef
ULONG DDKAPI ULONG
(*PHW_FIND_ADAPTER) ( (DDKAPI *PHW_FIND_ADAPTER) (
IN PVOID DeviceExtension, IN PVOID DeviceExtension,
IN PVOID HwContext, IN PVOID HwContext,
IN PVOID BusInformation, IN PVOID BusInformation,
@ -465,23 +465,23 @@ ULONG DDKAPI
); );
typedef typedef
BOOLEAN DDKAPI BOOLEAN
(*PHW_RESET_BUS) ( (DDKAPI *PHW_RESET_BUS) (
IN PVOID DeviceExtension, IN PVOID DeviceExtension,
IN ULONG PathId IN ULONG PathId
); );
typedef typedef
BOOLEAN DDKAPI BOOLEAN
(*PHW_ADAPTER_STATE) ( (DDKAPI *PHW_ADAPTER_STATE) (
IN PVOID DeviceExtension, IN PVOID DeviceExtension,
IN PVOID Context, IN PVOID Context,
IN BOOLEAN SaveState IN BOOLEAN SaveState
); );
typedef typedef
SCSI_ADAPTER_CONTROL_STATUS DDKAPI SCSI_ADAPTER_CONTROL_STATUS
(*PHW_ADAPTER_CONTROL) ( (DDKAPI *PHW_ADAPTER_CONTROL) (
IN PVOID DeviceExtension, IN PVOID DeviceExtension,
IN SCSI_ADAPTER_CONTROL_TYPE ControlType, IN SCSI_ADAPTER_CONTROL_TYPE ControlType,
IN PVOID Parameters IN PVOID Parameters

10
reactos/drivers/storage/ide/uniata/stdafx.h
View file

@ -19,7 +19,17 @@ extern "C" {
#include "id_queue.h" #include "id_queue.h"
#ifdef ExAllocatePool
#undef ExAllocatePool
#endif
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
#define TAG_UNIATA TAG('a', 't', 'a', 'U')
#define ExAllocatePool(a,b) ExAllocatePoolWithTag(a,b,TAG_UNIATA)
#endif //UNIATA_CORE #endif //UNIATA_CORE
#include "badblock.h" #include "badblock.h"

58
reactos/drivers/storage/ide/uniata/uata_ctl.h
View file

@ -50,6 +50,7 @@ extern "C" {
#define MAX_QUEUE_STAT 8 #define MAX_QUEUE_STAT 8
#define UNIATA_COMM_PORT_VENDOR_STR "UNIATA " "Management Port " UNIATA_VER_STR
#ifndef UNIATA_CORE #ifndef UNIATA_CORE
@ -65,6 +66,11 @@ extern "C" {
typedef struct _ADDREMOVEDEV { typedef struct _ADDREMOVEDEV {
ULONG WaitForPhysicalLink; // us ULONG WaitForPhysicalLink; // us
ULONG Flags;
#define UNIATA_REMOVE_FLAGS_HIDE 0x01
#define UNIATA_ADD_FLAGS_UNHIDE 0x01
} ADDREMOVEDEV, *PADDREMOVEDEV; } ADDREMOVEDEV, *PADDREMOVEDEV;
typedef struct _SETTRANSFERMODE { typedef struct _SETTRANSFERMODE {
@ -127,11 +133,49 @@ typedef struct _ADAPTERINFO {
ULONG NumberChannels; ULONG NumberChannels;
BOOLEAN ChanInfoValid; BOOLEAN ChanInfoValid;
CHAR Reserved[3];
ULONG AdapterInterfaceType;
CHANINFO Chan[AHCI_MAX_PORT]; CHANINFO Chan[AHCI_MAX_PORT];
} ADAPTERINFO, *PADAPTERINFO; } ADAPTERINFO, *PADAPTERINFO;
#ifdef USER_MODE
typedef enum _INTERFACE_TYPE {
InterfaceTypeUndefined = -1,
Internal,
Isa,
Eisa,
MicroChannel,
TurboChannel,
PCIBus,
VMEBus,
NuBus,
PCMCIABus,
CBus,
MPIBus,
MPSABus,
ProcessorInternal,
InternalPowerBus,
PNPISABus,
MaximumInterfaceType
} INTERFACE_TYPE, *PINTERFACE_TYPE;
typedef struct _PCI_SLOT_NUMBER {
union {
struct {
ULONG DeviceNumber:5;
ULONG FunctionNumber:3;
ULONG Reserved:24;
} bits;
ULONG AsULONG;
} u;
} PCI_SLOT_NUMBER, *PPCI_SLOT_NUMBER;
#endif
#ifndef ATA_FLAGS_DRDY_REQUIRED #ifndef ATA_FLAGS_DRDY_REQUIRED
//The ATA_PASS_THROUGH_DIRECT structure is used in conjunction with an IOCTL_ATA_PASS_THROUGH_DIRECT request to instruct the port driver to send an embedded ATA command to the target device. //The ATA_PASS_THROUGH_DIRECT structure is used in conjunction with an IOCTL_ATA_PASS_THROUGH_DIRECT request to instruct the port driver to send an embedded ATA command to the target device.
@ -179,22 +223,28 @@ typedef struct _IDEREGS_EX {
#define UNIATA_SPTI_EX_LBA48 0x08 #define UNIATA_SPTI_EX_LBA48 0x08
#define UNIATA_SPTI_EX_SPEC_TO 0x10 #define UNIATA_SPTI_EX_SPEC_TO 0x10
//#define UNIATA_SPTI_EX_FREEZE_TO 0x20 // do not reset device on timeout and keep interrupts disabled //#define UNIATA_SPTI_EX_FREEZE_TO 0x20 // do not reset device on timeout and keep interrupts disabled
#define UNIATA_SPTI_EX_USE_DMA 0x20 // Force DMA transfer mode
UCHAR bFeaturesRegH; // feature (high part for LBA48 mode) UCHAR bFeaturesRegH; // feature (high part for LBA48 mode)
UCHAR bSectorCountRegH; // IDE sector count register (high part for LBA48 mode) UCHAR bSectorCountRegH; // IDE sector count register (high part for LBA48 mode)
UCHAR bSectorNumberRegH; // IDE sector number register (high part for LBA48 mode) UCHAR bSectorNumberRegH; // IDE sector number register (high part for LBA48 mode)
UCHAR bCylLowRegH; // IDE low order cylinder value (high part for LBA48 mode) UCHAR bCylLowRegH; // IDE low order cylinder value (high part for LBA48 mode)
UCHAR bCylHighRegH; // IDE high order cylinder value (high part for LBA48 mode) UCHAR bCylHighRegH; // IDE high order cylinder value (high part for LBA48 mode)
UCHAR bReserved; // 0 UCHAR bReserved2; // 0
} IDEREGS_EX, *PIDEREGS_EX, *LPIDEREGS_EX; } IDEREGS_EX, *PIDEREGS_EX, *LPIDEREGS_EX;
typedef struct _UNIATA_REG_IO { typedef struct _UNIATA_REG_IO {
USHORT RegIDX; USHORT RegIDX;
UCHAR RegSz:2; // 0=1, 1=2, 2=4, 3=2+2 (for lba48) UCHAR RegSz:3; // 0=1, 1=2, 2=4, 3=1+1 (for lba48) 4=2+2 (for lba48)
UCHAR InOut:1; // 0=in, 1=out UCHAR InOut:1; // 0=in, 1=out
UCHAR Reserved:5; UCHAR Reserved:4;
UCHAR Reserved1; UCHAR Reserved1;
ULONG Data; union {
ULONG Data;
ULONG d32;
USHORT d16[2];
USHORT d8[2];
};
} UNIATA_REG_IO, *PUNIATA_REG_IO; } UNIATA_REG_IO, *PUNIATA_REG_IO;
typedef struct _UNIATA_REG_IO_HDR { typedef struct _UNIATA_REG_IO_HDR {

1
reactos/drivers/storage/ide/uniata/uniata.rbuild
View file

@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="uniata" type="kernelmodedriver" installbase="system32/drivers" allowwarnings="true" installname="uniata.sys"> <module name="uniata" type="kernelmodedriver" installbase="system32/drivers" allowwarnings="true" installname="uniata.sys">
<bootstrap installbase="$(CDOUTPUT)" /> <bootstrap installbase="$(CDOUTPUT)" />
<define name="_DEBUG" />
<include base="uniata">.</include> <include base="uniata">.</include>
<include base="uniata">inc</include> <include base="uniata">inc</include>
<library>ntoskrnl</library> <library>ntoskrnl</library>

8
reactos/drivers/storage/ide/uniata/uniata_ver.h
View file

@ -1,2 +1,6 @@
#define UNIATA_VER_STR "39f"
#define UNIATA_VER_STR "38c2" #define UNIATA_VER_DOT 0.39.6.0
#define UNIATA_VER_DOT_COMMA 0,39,6,0
#define UNIATA_VER_DOT_STR "0.39.6.0"
#define UNIATA_VER_YEAR 2007
#define UNIATA_VER_YEAR_STR "2007"