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

[UNIATA]

Browse source 
Update to 0.45b1.
CORE-8280 #resolve

svn path=/trunk/; revision=64856
This commit is contained in:
Sylvain Petreolle 2014-10-20 21:21:43 +00:00
parent 1a453ba5b6
commit ccf02b054c
2 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -587,10 +587,8 @@ AtapiDmaStart(
case ATA_PROMISE_ID: case ATA_PROMISE_ID:
if(ChipType == PRNEW) { if(ChipType == PRNEW) {
ULONG Channel = deviceExtension->Channel + lChannel; ULONG Channel = deviceExtension->Channel + lChannel;
if(chan->ChannelCtrlFlags & CTRFLAGS_LBA48) { if(chan->ChannelCtrlFlags & CTRFLAGS_LBA48) {
AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11,
AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) |
(Channel ? 0x08 : 0x02));
AtapiWritePortEx4(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),(Channel ? 0x24 : 0x20), AtapiWritePortEx4(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),(Channel ? 0x24 : 0x20),
((Srb->SrbFlags & SRB_FLAGS_DATA_IN) ? 0x05000000 : 0x06000000) | (Srb->DataTransferLength >> 1) ((Srb->SrbFlags & SRB_FLAGS_DATA_IN) ? 0x05000000 : 0x06000000) | (Srb->DataTransferLength >> 1)
); );
@ -659,10 +657,12 @@ AtapiDmaDone(
case ATA_PROMISE_ID: case ATA_PROMISE_ID:
if(ChipType == PRNEW) { if(ChipType == PRNEW) {
ULONG Channel = deviceExtension->Channel + lChannel; ULONG Channel = deviceExtension->Channel + lChannel;
/*
AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11,
AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) &
~(Channel ? 0x08 : 0x02));
*/
if(chan->ChannelCtrlFlags & CTRFLAGS_LBA48) { if(chan->ChannelCtrlFlags & CTRFLAGS_LBA48) {
AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11,
AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) &
~(Channel ? 0x08 : 0x02));
AtapiWritePortEx4(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),(Channel ? 0x24 : 0x20), AtapiWritePortEx4(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),(Channel ? 0x24 : 0x20),
0 0
); );
@ -1555,10 +1555,13 @@ set_new_acard:
return; return;
break; } break; }
case ATA_PROMISE_ID: case ATA_PROMISE_ID: {
/***********/ /***********/
/* Promise */ /* Promise */
/***********/ /***********/
UCHAR sel66 = Channel ? 0x08: 0x02;
if(ChipType < PRTX) { if(ChipType < PRTX) {
if (isAtapi) { if (isAtapi) {
udmamode = udmamode =
@ -1566,12 +1569,29 @@ set_new_acard:
} }
} }
for(i=udmamode; i>=0; i--) { for(i=udmamode; i>=0; i--) {
if(ChipType == PRNEW) {
if(i>2) {
AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11,
AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) |
sel66);
} else {
AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11,
AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) &
~sel66);
}
}
if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_UDMA0 + i)) { if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_UDMA0 + i)) {
promise_timing(deviceExtension, dev, (UCHAR)(ATA_UDMA + i)); // ??? promise_timing(deviceExtension, dev, (UCHAR)(ATA_UDMA + i)); // ???
return; return;
} }
} }
if(ChipType == PRNEW) {
AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11,
AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) &
~sel66);
}
for(i=wdmamode; i>=0; i--) { for(i=wdmamode; i>=0; i--) {
if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_WDMA0 + i)) { if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_WDMA0 + i)) {
promise_timing(deviceExtension, dev, (UCHAR)(ATA_WDMA0+i)); promise_timing(deviceExtension, dev, (UCHAR)(ATA_WDMA0+i));
@ -1587,7 +1607,7 @@ set_new_acard:
AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode);
promise_timing(deviceExtension, dev, ATA_PIO0 + apiomode); promise_timing(deviceExtension, dev, ATA_PIO0 + apiomode);
return; return;
break; break; }
case ATA_ATI_ID: case ATA_ATI_ID:
KdPrint2((PRINT_PREFIX "ATI\n")); KdPrint2((PRINT_PREFIX "ATI\n"));

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

@ -1,10 +1,10 @@
#define UNIATA_VER_STR "45b" #define UNIATA_VER_STR "45b1"
#define UNIATA_VER_DOT 0.45.2.0 #define UNIATA_VER_DOT 0.45.2.1
#define UNIATA_VER_MJ 0 #define UNIATA_VER_MJ 0
#define UNIATA_VER_MN 45 #define UNIATA_VER_MN 45
#define UNIATA_VER_SUB_MJ 2 #define UNIATA_VER_SUB_MJ 2
#define UNIATA_VER_SUB_MN 0 #define UNIATA_VER_SUB_MN 1
#define UNIATA_VER_DOT_COMMA 0,45,2,0 #define UNIATA_VER_DOT_COMMA 0,45,2,1
#define UNIATA_VER_DOT_STR "0.45.2.0" #define UNIATA_VER_DOT_STR "0.45.2.1"
#define UNIATA_VER_YEAR 2014 #define UNIATA_VER_YEAR 2014
#define UNIATA_VER_YEAR_STR "2014" #define UNIATA_VER_YEAR_STR "2014"