Ros-dev March 2005

ros-dev@reactos.org

64 participants
200 discussions

by Waldo Alvarez Cañizares

Hi Harmunt: I remember the solution for this was Bochs + Hardisk images using sparse files. From: ros-dev-bounces(a)reactos.com on behalf of Hartmut Birr Sent: Wed 3/2/2005 3:01 PM To: ReactOS Development List Subject: Re: [ros-dev] Changelog 0.2.6 Release. michael(a)fritscher.net schrieb: >Hmm, I think we shouldn't release 0.2.6 until ros can boot from the first >128 GB from a over 128 GB HDD again, because I think that's a big >regression > > Hi, I can implement the large LBA addressing mode in atapi. But I cannot test it, because my largest ide disk is only 120GB. - Hartmut

19 years, 6 months

Re: Re: Re: [ros-dev] added a proposed patch to bugzilla

by Johannes Olofsson

Hi! What is the output (with the changed line) when the key is pressed, whithout a modifier key, with shift, with caps lock, with caps lock + shift and with alt gr? Regards Johannes Olofsson > Från: Roman Hoegg <roman.hoegg(a)unisg.ch> > Till: ReactOS Development List <ros-dev(a)reactos.com> > Rubrik: Re: Re: [ros-dev] added a proposed patch to bugzilla > Datum: Wed, 2 Mar 2005 20:58:46 +0100 > Try to change the line : > /* none, shift, ctrl-alt, ctrl, ctrl-shift */ > { VK_OEM_7, NOCAPS, 0xe4, 0xe0, 0x7b, WCH_NONE, 0x00 }, /* ä à { */ > to: > { VK_OEM_7, KCTRL, 'code for ä', 'code for à', 0x7b, 'code for Ä', 'code for À }, /* ä à { */ > in order to use the ctrl and ctrl-shift states for caps lock for this key. thanks for the help. What you suggest here actually works (I've just tested it). However, what it does is it makes Ctrl to behave the way CapsLock should behave and turns CapsLock into AltGr (strange...). That's not how my keyboard acts on other OS'. I really think there should be a way to differentiate between CapsLock and Shift. I'm sure that there will also be other keyboards that need that in the future. thanks! Roman Högg_______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.com http://reactos.com:8080/mailman/listinfo/ros-dev Otur i kärlek - http://www.spray.se/spel Tur i kärlek - http://www.spraydate.com

19 years, 6 months

Re: [ros-diffs] [arty] 13810: Some warning suppression. Read the<rant/>.

by d_layer

Hi, Actually this is a designed behavior of -Wconversion and not a bug. http://gcc.gnu.org/ml/gcc/2002-12/msg01431.html -- d_layer arty(a)svn.reactos.com wrote: > + * <rant> > + * These fix the following warning in GCC: > + * warning: passing arg 1 of `ntohs' with different width due to > prototype > + * > + * Even if you declare an unsigned char or unsigned short variable and > pass > + * it to htons or ntohs, this warning will be generated. I believe > this is > + * a gcc bug. You can try to reproduce the bug like this: > + * > + * u_short foo(u_short bar) { > + * return htons(bar); > + * } > + * > + * Using the reactos compiler settings this generates the error. > Unless I'm > + * missing something, the active prototypes for htons and ntohs are: > + * > + * u_short PASCAL htons(u_short); > + * u_short PASCAL ntohs(u_short); > + * > + * From winsock2.h. Since the function above has exactly the same > signature > + * as htons except for the required PASCAL (__stdcall) decoration, gcc > is > + * erroneously detecting a narrowed value. > + * </rant>

19 years, 6 months

Re: [ros-diffs] [ion] 13813: Fix queue item not being cleaned. Thank you Jim

by Filip Navara

ion(a)svn.reactos.com wrote: >Fix queue item not being cleaned. Thank you Jim > >Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/queue.c > > > ------------------------------------------------------------------------ > *Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/queue.c* > >--- branches/alex_devel_branch/reactos/ntoskrnl/ke/queue.c 2005-03-04 04:10:03 UTC (rev 13812) >+++ branches/alex_devel_branch/reactos/ntoskrnl/ke/queue.c 2005-03-04 04:15:46 UTC (rev 13813) >@@ -207,7 +207,7 @@ > > > /* Remove the Entry */ > RemoveEntryList(ListEntry); > > >- Entry->Flink = NULL; > > >+ ListEntry->Flink = NULL; > > > > /* Nothing to wait on */ > break; > > This looks wrong. You should never clean list item this way, instead you should use "InitializeListHead(ListEntry);". - Filip

19 years, 6 months

Mission X03-02: Recover Ancient Cutler Artifact

by Alex Ionescu

19 years, 6 months

atapi patch for test / review

by Hartmut Birr

Hi, I've add 48bit support to atapi. I cannot test the 48bit support. Please test it. Be careful. If something is wrong, atapi can corrupt other partitions on the same disk. - Hartmut M:\Sandbox\ros_work\reactos>set SVN_EDITOR=notepad M:\Sandbox\ros_work\reactos>d:\programme\subversion\bin\svn.exe diff drivers\storage\atapi Index: drivers/storage/atapi/atapi.c =================================================================== --- drivers/storage/atapi/atapi.c (revision 13795) +++ drivers/storage/atapi/atapi.c (working copy) @@ -1327,6 +1327,8 @@ DrvParms->TMSectorCountHi, DrvParms->TMSectorCountLo, (ULONG)((DrvParms->TMSectorCountHi << 16) + DrvParms->TMSectorCountLo)); + DPRINT1("SupportedFeatures83: %x, SupportedFeatures84 %x\n", DrvParms->SupportedFeatures83, DrvParms->SupportedFeatures84); + DPRINT1("Max48BitAddress: %I64d\n", *(PULONGLONG)DrvParms->Max48BitAddress); if (DrvParms->TMFieldsValid & 0x0004) { if ((DrvParms->UltraDmaModes >> 8) && (DrvParms->UltraDmaModes & 0xff)) @@ -1952,7 +1954,7 @@ { PREAD_CAPACITY_DATA CapacityData; PIDE_DRIVE_IDENTIFY DeviceParams; - ULONG LastSector; + LARGE_INTEGER LastSector; DPRINT("SCSIOP_READ_CAPACITY: TargetId: %lu\n", Srb->TargetId); CapacityData = (PREAD_CAPACITY_DATA)Srb->DataBuffer; @@ -1964,15 +1966,34 @@ /* Calculate last sector (big-endian). */ if (DeviceParams->Capabilities & IDE_DRID_LBA_SUPPORTED) { - LastSector = (ULONG)((DeviceParams->TMSectorCountHi << 16) + - DeviceParams->TMSectorCountLo) - 1; + if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS) + { + ((PUSHORT)&LastSector)[0] = DeviceParams->Max48BitAddress[0]; + ((PUSHORT)&LastSector)[1] = DeviceParams->Max48BitAddress[1]; + ((PUSHORT)&LastSector)[2] = DeviceParams->Max48BitAddress[2]; + ((PUSHORT)&LastSector)[3] = DeviceParams->Max48BitAddress[3]; + LastSector.QuadPart -= 1; + + } + else + { + LastSector.u.HighPart = 0; + LastSector.u.LowPart = (ULONG)((DeviceParams->TMSectorCountHi << 16) + + DeviceParams->TMSectorCountLo)-1; + } } else { - LastSector = (ULONG)(DeviceParams->LogicalCyls * - DeviceParams->LogicalHeads * - DeviceParams->SectorsPerTrack)-1; + LastSector.u.HighPart = 0; + LastSector.u.LowPart = (ULONG)(DeviceParams->LogicalCyls * + DeviceParams->LogicalHeads * + DeviceParams->SectorsPerTrack)-1; } + if (LastSector.u.HighPart) + { + DPRINT1("Disk is too large for our implementation (%I64d sectors\n", LastSector.QuadPart); + KEBUGCHECK(0); + } CapacityData->LogicalBlockAddress = (((PUCHAR)&LastSector)[0] << 24) | (((PUCHAR)&LastSector)[1] << 16) | @@ -2003,6 +2024,7 @@ UCHAR Command; ULONG Retries; UCHAR Status; + UCHAR Regs[10]; BOOLEAN FASTCALL (*Handler)(PATAPI_MINIPORT_EXTENSION DevExt); DPRINT("AtapiReadWrite() called!\n"); @@ -2027,12 +2049,28 @@ if (DeviceParams->Capabilities & IDE_DRID_LBA_SUPPORTED) { - SectorNumber = StartingSector & 0xff; - CylinderLow = (StartingSector >> 8) & 0xff; - CylinderHigh = (StartingSector >> 16) & 0xff; - DrvHead = ((StartingSector >> 24) & 0x0f) | - (Srb->TargetId ? IDE_DH_DRV1 : 0) | - IDE_DH_LBA; + if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS) + { + Regs[0] = 0; + Regs[1] = 0; + Regs[2] = SectorCount & 0xff; + Regs[3] = (SectorCount >> 8) & 0xff; + Regs[4] = StartingSector & 0xff; + Regs[5] = (StartingSector >> 8) & 0xff; + Regs[6] = (StartingSector >> 16) & 0xff; + Regs[7] = (StartingSector >> 24) & 0xff; + Regs[8] = 0; + Regs[9] = 0; + } + else + { + SectorNumber = StartingSector & 0xff; + CylinderLow = (StartingSector >> 8) & 0xff; + CylinderHigh = (StartingSector >> 16) & 0xff; + DrvHead = ((StartingSector >> 24) & 0x0f) | + (Srb->TargetId ? IDE_DH_DRV1 : 0) | + IDE_DH_LBA; + } } else { @@ -2119,13 +2157,33 @@ #endif /* Setup command parameters */ - IDEWritePrecomp(DeviceExtension->CommandPortBase, 0); - IDEWriteSectorCount(DeviceExtension->CommandPortBase, SectorCount); - IDEWriteSectorNum(DeviceExtension->CommandPortBase, SectorNumber); - IDEWriteCylinderHigh(DeviceExtension->CommandPortBase, CylinderHigh); - IDEWriteCylinderLow(DeviceExtension->CommandPortBase, CylinderLow); - IDEWriteDriveHead(DeviceExtension->CommandPortBase, IDE_DH_FIXED | DrvHead); + if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS) + { + IDEWritePrecomp(DeviceExtension->CommandPortBase, Regs[1]); + IDEWriteSectorCount(DeviceExtension->CommandPortBase, Regs[3]); + IDEWriteSectorNum(DeviceExtension->CommandPortBase, Regs[7]); + IDEWriteCylinderLow(DeviceExtension->CommandPortBase, Regs[8]); + IDEWriteCylinderHigh(DeviceExtension->CommandPortBase, Regs[9]); + IDEWritePrecomp(DeviceExtension->CommandPortBase, Regs[0]); + IDEWriteSectorCount(DeviceExtension->CommandPortBase, Regs[2]); + IDEWriteSectorNum(DeviceExtension->CommandPortBase, Regs[4]); + IDEWriteCylinderLow(DeviceExtension->CommandPortBase, Regs[5]); + IDEWriteCylinderHigh(DeviceExtension->CommandPortBase, Regs[6]); + + IDEWriteDriveHead(DeviceExtension->CommandPortBase, IDE_DH_FIXED); + + } + else + { + IDEWritePrecomp(DeviceExtension->CommandPortBase, 0); + IDEWriteSectorCount(DeviceExtension->CommandPortBase, SectorCount); + IDEWriteSectorNum(DeviceExtension->CommandPortBase, SectorNumber); + IDEWriteCylinderHigh(DeviceExtension->CommandPortBase, CylinderHigh); + IDEWriteCylinderLow(DeviceExtension->CommandPortBase, CylinderLow); + IDEWriteDriveHead(DeviceExtension->CommandPortBase, IDE_DH_FIXED | DrvHead); + } + #ifdef ENABLE_DMA if (DeviceExtension->PRDTable && DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_DMA_CMD) @@ -2135,7 +2193,14 @@ if (DeviceExtension->UseDma) { Handler = AtapiDmaInterrupt; - Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_DMA : IDE_CMD_WRITE_DMA; + if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS) + { + Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_DMA_EXT : IDE_CMD_WRITE_DMA_EXT; + } + else + { + Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_DMA : IDE_CMD_WRITE_DMA; + } } else #endif @@ -2143,11 +2208,25 @@ Handler = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? AtapiReadInterrupt : AtapiWriteInterrupt; if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_MULTI_SECTOR_CMD) { - Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_MULTIPLE : IDE_CMD_WRITE_MULTIPLE; + if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS) + { + Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_MULTIPLE_EXT : IDE_CMD_WRITE_MULTIPLE_EXT; + } + else + { + Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_MULTIPLE : IDE_CMD_WRITE_MULTIPLE; + } } else { - Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ : IDE_CMD_WRITE; + if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS) + { + Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_EXT : IDE_CMD_WRITE_EXT; + } + else + { + Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ : IDE_CMD_WRITE; + } } } @@ -2274,7 +2353,9 @@ ScsiPortStallExecution(10); /* Issue command to drive */ - AtapiExecuteCommand(DeviceExtension, IDE_CMD_FLUSH_CACHE, AtapiNoDataInterrupt); + AtapiExecuteCommand(DeviceExtension, + DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS ? IDE_CMD_FLUSH_CACHE_EXT : IDE_CMD_FLUSH_CACHE, + AtapiNoDataInterrupt); /* Wait for controller ready */ for (Retries = 0; Retries < IDE_MAX_WRITE_RETRIES; Retries++) Index: drivers/storage/atapi/atapi.h =================================================================== --- drivers/storage/atapi/atapi.h (revision 13795) +++ drivers/storage/atapi/atapi.h (working copy) @@ -64,21 +64,27 @@ #define IDE_REG_COMMAND 0x0007 /* IDE/ATA commands */ -#define IDE_CMD_RESET 0x08 -#define IDE_CMD_READ 0x20 -#define IDE_CMD_READ_RETRY 0x21 -#define IDE_CMD_WRITE 0x30 -#define IDE_CMD_WRITE_RETRY 0x31 -#define IDE_CMD_PACKET 0xA0 -#define IDE_CMD_READ_MULTIPLE 0xC4 -#define IDE_CMD_WRITE_MULTIPLE 0xC5 -#define IDE_CMD_READ_DMA 0xC8 -#define IDE_CMD_WRITE_DMA 0xCA -#define IDE_CMD_FLUSH_CACHE 0xE7 -#define IDE_CMD_FLUSH_CACHE_EXT 0xEA -#define IDE_CMD_IDENT_ATA_DRV 0xEC -#define IDE_CMD_IDENT_ATAPI_DRV 0xA1 -#define IDE_CMD_GET_MEDIA_STATUS 0xDA +#define IDE_CMD_RESET 0x08 +#define IDE_CMD_READ 0x20 +#define IDE_CMD_READ_ONCE 0x21 +#define IDE_CMD_READ_EXT 0x24 /* 48 bit */ +#define IDE_CMD_READ_DMA_EXT 0x25 /* 48 bit */ +#define IDE_CMD_READ_MULTIPLE_EXT 0x29 /* 48 bit */ +#define IDE_CMD_WRITE 0x30 +#define IDE_CMD_WRITE_ONCE 0x31 +#define IDE_CMD_WRITE_EXT 0x34 /* 48 bit */ +#define IDE_CMD_WRITE_DMA_EXT 0x35 /* 48 bit */ +#define IDE_CMD_WRITE_MULTIPLE_EXT 0x39 /* 48 bit */ +#define IDE_CMD_PACKET 0xA0 +#define IDE_CMD_READ_MULTIPLE 0xC4 +#define IDE_CMD_WRITE_MULTIPLE 0xC5 +#define IDE_CMD_READ_DMA 0xC8 +#define IDE_CMD_WRITE_DMA 0xCA +#define IDE_CMD_FLUSH_CACHE 0xE7 +#define IDE_CMD_FLUSH_CACHE_EXT 0xEA /* 48 bit */ +#define IDE_CMD_IDENT_ATA_DRV 0xEC +#define IDE_CMD_IDENT_ATAPI_DRV 0xA1 +#define IDE_CMD_GET_MEDIA_STATUS 0xDA // // Access macros for command registers

19 years, 6 months

[Fwd: Re: [ros-dev] atapi patch for test / review - failure]

by Hartmut Birr

Send it again with the correct date... Hi, I've fixed the problem. Please try it again. - Hartmut Hartmut Birr schrieb: >michael(a)fritscher.net schrieb: > > > >>Seems to be a bug betweeb VMware 4.5.2 and ros, because on real HW it >>works well (almost, because I get a BSOD during the reboot after be second >>stage install, yust after clicking the reboot-botton) >> >> >> >> >> >It's not a bug in vmware. I've made a little mistake. The drive head >register isn't set correctly in 48bit mode. I've update my old vmware >beta. I will send a new patch if it works in vmware. > >- Hartmut > > > >_______________________________________________ >Ros-dev mailing list >Ros-dev(a)reactos.com >http://reactos.com:8080/mailman/listinfo/ros-dev > > > > M:\Sandbox\ros_work\reactos>set SVN_EDITOR=notepad M:\Sandbox\ros_work\reactos>d:\programme\subversion\bin\svn.exe diff drivers\storage\atapi Index: drivers/storage/atapi/atapi.c =================================================================== --- drivers/storage/atapi/atapi.c (revision 13806) +++ drivers/storage/atapi/atapi.c (working copy) @@ -1327,6 +1327,8 @@ DrvParms->TMSectorCountHi, DrvParms->TMSectorCountLo, (ULONG)((DrvParms->TMSectorCountHi << 16) + DrvParms->TMSectorCountLo)); + DPRINT1("SupportedFeatures83: %x, EnabledFeatures86 %x\n", DrvParms->SupportedFeatures83, DrvParms->EnabledFeatures86); + DPRINT1("Max48BitAddress: %I64d\n", *(PULONGLONG)DrvParms->Max48BitAddress); if (DrvParms->TMFieldsValid & 0x0004) { if ((DrvParms->UltraDmaModes >> 8) && (DrvParms->UltraDmaModes & 0xff)) @@ -1952,7 +1954,7 @@ { PREAD_CAPACITY_DATA CapacityData; PIDE_DRIVE_IDENTIFY DeviceParams; - ULONG LastSector; + LARGE_INTEGER LastSector; DPRINT("SCSIOP_READ_CAPACITY: TargetId: %lu\n", Srb->TargetId); CapacityData = (PREAD_CAPACITY_DATA)Srb->DataBuffer; @@ -1964,15 +1966,34 @@ /* Calculate last sector (big-endian). */ if (DeviceParams->Capabilities & IDE_DRID_LBA_SUPPORTED) { - LastSector = (ULONG)((DeviceParams->TMSectorCountHi << 16) + - DeviceParams->TMSectorCountLo) - 1; + if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS) + { + ((PUSHORT)&LastSector)[0] = DeviceParams->Max48BitAddress[0]; + ((PUSHORT)&LastSector)[1] = DeviceParams->Max48BitAddress[1]; + ((PUSHORT)&LastSector)[2] = DeviceParams->Max48BitAddress[2]; + ((PUSHORT)&LastSector)[3] = DeviceParams->Max48BitAddress[3]; + LastSector.QuadPart -= 1; + + } + else + { + LastSector.u.HighPart = 0; + LastSector.u.LowPart = (ULONG)((DeviceParams->TMSectorCountHi << 16) + + DeviceParams->TMSectorCountLo)-1; + } } else { - LastSector = (ULONG)(DeviceParams->LogicalCyls * - DeviceParams->LogicalHeads * - DeviceParams->SectorsPerTrack)-1; + LastSector.u.HighPart = 0; + LastSector.u.LowPart = (ULONG)(DeviceParams->LogicalCyls * + DeviceParams->LogicalHeads * + DeviceParams->SectorsPerTrack)-1; } + if (LastSector.u.HighPart) + { + DPRINT1("Disk is too large for our implementation (%I64d sectors\n", LastSector.QuadPart); + KEBUGCHECK(0); + } CapacityData->LogicalBlockAddress = (((PUCHAR)&LastSector)[0] << 24) | (((PUCHAR)&LastSector)[1] << 16) | @@ -1996,10 +2017,8 @@ PIDE_DRIVE_IDENTIFY DeviceParams; ULONG StartingSector; ULONG SectorCount; - UCHAR CylinderHigh; - UCHAR CylinderLow; UCHAR DrvHead; - UCHAR SectorNumber; + UCHAR Regs[10]; UCHAR Command; ULONG Retries; UCHAR Status; @@ -2027,22 +2046,44 @@ if (DeviceParams->Capabilities & IDE_DRID_LBA_SUPPORTED) { - SectorNumber = StartingSector & 0xff; - CylinderLow = (StartingSector >> 8) & 0xff; - CylinderHigh = (StartingSector >> 16) & 0xff; - DrvHead = ((StartingSector >> 24) & 0x0f) | - (Srb->TargetId ? IDE_DH_DRV1 : 0) | - IDE_DH_LBA; + if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS) + { + Regs[1] = 0; + Regs[2] = SectorCount & 0xff; + Regs[3] = (SectorCount >> 8) & 0xff; + Regs[4] = StartingSector & 0xff; + Regs[5] = (StartingSector >> 8) & 0xff; + Regs[6] = (StartingSector >> 16) & 0xff; + Regs[7] = (StartingSector >> 24) & 0xff; + Regs[8] = 0; + Regs[9] = 0; + DrvHead = ((StartingSector >> 24) & 0x0f) | + (Srb->TargetId ? IDE_DH_DRV1 : 0) | + IDE_DH_LBA; + } + else + { + Regs[0] = 0; + Regs[2] = SectorCount & 0xff; + Regs[4] = StartingSector & 0xff; + Regs[5] = (StartingSector >> 8) & 0xff; + Regs[6] = (StartingSector >> 16) & 0xff; + DrvHead = ((StartingSector >> 24) & 0x0f) | + (Srb->TargetId ? IDE_DH_DRV1 : 0) | + IDE_DH_LBA; + } } else { - SectorNumber = (StartingSector % DeviceParams->SectorsPerTrack) + 1; + Regs[0] = 0; + Regs[2] = SectorCount & 0xff; + Regs[4] = (StartingSector % DeviceParams->SectorsPerTrack) + 1; StartingSector /= DeviceParams->SectorsPerTrack; DrvHead = (StartingSector % DeviceParams->LogicalHeads) | (Srb->TargetId ? IDE_DH_DRV1 : 0); StartingSector /= DeviceParams->LogicalHeads; - CylinderLow = StartingSector & 0xff; - CylinderHigh = StartingSector >> 8; + Regs[5] = StartingSector & 0xff; + Regs[6] = StartingSector >> 8; } if (DrvHead & IDE_DH_LBA) @@ -2052,7 +2093,7 @@ DeviceExtension->CommandPortBase, DrvHead & IDE_DH_DRV1 ? 1 : 0, ((DrvHead & 0x0f) << 24) + - (CylinderHigh << 16) + (CylinderLow << 8) + SectorNumber, + (Regs[6] << 16) + (Regs[5] << 8) + Regs[4], SectorCount, Command); } @@ -2062,10 +2103,10 @@ (Srb->SrbFlags & SRB_FLAGS_DATA_IN) ? "READ" : "WRITE", DeviceExtension->CommandPortBase, DrvHead & IDE_DH_DRV1 ? 1 : 0, - CylinderHigh, - CylinderLow, + Regs[6], + Regs[5], DrvHead & 0x0f, - SectorNumber, + Regs[4], SectorCount, Command); } @@ -2119,13 +2160,23 @@ #endif /* Setup command parameters */ - IDEWritePrecomp(DeviceExtension->CommandPortBase, 0); - IDEWriteSectorCount(DeviceExtension->CommandPortBase, SectorCount); - IDEWriteSectorNum(DeviceExtension->CommandPortBase, SectorNumber); - IDEWriteCylinderHigh(DeviceExtension->CommandPortBase, CylinderHigh); - IDEWriteCylinderLow(DeviceExtension->CommandPortBase, CylinderLow); - IDEWriteDriveHead(DeviceExtension->CommandPortBase, IDE_DH_FIXED | DrvHead); + if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS) + { + IDEWritePrecomp(DeviceExtension->CommandPortBase, Regs[1]); + IDEWriteSectorCount(DeviceExtension->CommandPortBase, Regs[3]); + IDEWriteSectorNum(DeviceExtension->CommandPortBase, Regs[7]); + IDEWriteCylinderLow(DeviceExtension->CommandPortBase, Regs[8]); + IDEWriteCylinderHigh(DeviceExtension->CommandPortBase, Regs[9]); + } + IDEWritePrecomp(DeviceExtension->CommandPortBase, Regs[0]); + IDEWriteSectorCount(DeviceExtension->CommandPortBase, Regs[2]); + IDEWriteSectorNum(DeviceExtension->CommandPortBase, Regs[4]); + IDEWriteCylinderLow(DeviceExtension->CommandPortBase, Regs[5]); + IDEWriteCylinderHigh(DeviceExtension->CommandPortBase, Regs[6]); + + IDEWriteDriveHead(DeviceExtension->CommandPortBase, IDE_DH_FIXED|DrvHead); + #ifdef ENABLE_DMA if (DeviceExtension->PRDTable && DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_DMA_CMD) @@ -2135,7 +2186,14 @@ if (DeviceExtension->UseDma) { Handler = AtapiDmaInterrupt; - Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_DMA : IDE_CMD_WRITE_DMA; + if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS) + { + Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_DMA_EXT : IDE_CMD_WRITE_DMA_EXT; + } + else + { + Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_DMA : IDE_CMD_WRITE_DMA; + } } else #endif @@ -2143,11 +2201,25 @@ Handler = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? AtapiReadInterrupt : AtapiWriteInterrupt; if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_MULTI_SECTOR_CMD) { - Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_MULTIPLE : IDE_CMD_WRITE_MULTIPLE; + if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS) + { + Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_MULTIPLE_EXT : IDE_CMD_WRITE_MULTIPLE_EXT; + } + else + { + Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_MULTIPLE : IDE_CMD_WRITE_MULTIPLE; + } } else { - Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ : IDE_CMD_WRITE; + if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS) + { + Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_EXT : IDE_CMD_WRITE_EXT; + } + else + { + Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ : IDE_CMD_WRITE; + } } } @@ -2274,7 +2346,9 @@ ScsiPortStallExecution(10); /* Issue command to drive */ - AtapiExecuteCommand(DeviceExtension, IDE_CMD_FLUSH_CACHE, AtapiNoDataInterrupt); + AtapiExecuteCommand(DeviceExtension, + DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS ? IDE_CMD_FLUSH_CACHE_EXT : IDE_CMD_FLUSH_CACHE, + AtapiNoDataInterrupt); /* Wait for controller ready */ for (Retries = 0; Retries < IDE_MAX_WRITE_RETRIES; Retries++) Index: drivers/storage/atapi/atapi.h =================================================================== --- drivers/storage/atapi/atapi.h (revision 13806) +++ drivers/storage/atapi/atapi.h (working copy) @@ -64,21 +64,27 @@ #define IDE_REG_COMMAND 0x0007 /* IDE/ATA commands */ -#define IDE_CMD_RESET 0x08 -#define IDE_CMD_READ 0x20 -#define IDE_CMD_READ_RETRY 0x21 -#define IDE_CMD_WRITE 0x30 -#define IDE_CMD_WRITE_RETRY 0x31 -#define IDE_CMD_PACKET 0xA0 -#define IDE_CMD_READ_MULTIPLE 0xC4 -#define IDE_CMD_WRITE_MULTIPLE 0xC5 -#define IDE_CMD_READ_DMA 0xC8 -#define IDE_CMD_WRITE_DMA 0xCA -#define IDE_CMD_FLUSH_CACHE 0xE7 -#define IDE_CMD_FLUSH_CACHE_EXT 0xEA -#define IDE_CMD_IDENT_ATA_DRV 0xEC -#define IDE_CMD_IDENT_ATAPI_DRV 0xA1 -#define IDE_CMD_GET_MEDIA_STATUS 0xDA +#define IDE_CMD_RESET 0x08 +#define IDE_CMD_READ 0x20 +#define IDE_CMD_READ_ONCE 0x21 +#define IDE_CMD_READ_EXT 0x24 /* 48 bit */ +#define IDE_CMD_READ_DMA_EXT 0x25 /* 48 bit */ +#define IDE_CMD_READ_MULTIPLE_EXT 0x29 /* 48 bit */ +#define IDE_CMD_WRITE 0x30 +#define IDE_CMD_WRITE_ONCE 0x31 +#define IDE_CMD_WRITE_EXT 0x34 /* 48 bit */ +#define IDE_CMD_WRITE_DMA_EXT 0x35 /* 48 bit */ +#define IDE_CMD_WRITE_MULTIPLE_EXT 0x39 /* 48 bit */ +#define IDE_CMD_PACKET 0xA0 +#define IDE_CMD_READ_MULTIPLE 0xC4 +#define IDE_CMD_WRITE_MULTIPLE 0xC5 +#define IDE_CMD_READ_DMA 0xC8 +#define IDE_CMD_WRITE_DMA 0xCA +#define IDE_CMD_FLUSH_CACHE 0xE7 +#define IDE_CMD_FLUSH_CACHE_EXT 0xEA /* 48 bit */ +#define IDE_CMD_IDENT_ATA_DRV 0xEC +#define IDE_CMD_IDENT_ATAPI_DRV 0xA1 +#define IDE_CMD_GET_MEDIA_STATUS 0xDA // // Access macros for command registers

19 years, 6 months

RE: [ros-dev] Alex has fixed the laptop problem

by Murphy, Ged (Bolton)

> -----Original Message----- > From: Casper Hornstrup [mailto:ch@csh-consult.dk] > Sent: 03 March 2005 12:36 > To: 'ReactOS Development List' > Subject: RE: [ros-dev] Alex has fixed the laptop problem > > > > -----Original Message----- > > From: ros-dev-bounces(a)reactos.com > > [mailto:ros-dev-bounces@reactos.com] On Behalf Of Murphy, Ged (Bolton) > > Sent: 3. marts 2005 09:25 > > To: 'ReactOS Development List' > > Subject: RE: [ros-dev] Alex has fixed the laptop problem > > > > Alex Ionescu wrote: > > > > > Do you want to delay 0.2.6 until I merge with tip? Else it > > will be for > > > 0.3.x/0.2.7 > > > > > > Best regards, > > > Alex Ionescu > > > > What is tip ? > > He means trunk. Tip (or HEAD) is the latest revision in the repository. > Alex, when will you be ready to merge ? ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

19 years, 6 months

RE: [ros-dev] Alex has fixed the laptop problem

by Murphy, Ged (Bolton)

Alex Ionescu wrote: > Do you want to delay 0.2.6 until I merge with tip? Else it will be for > 0.3.x/0.2.7 > > Best regards, > Alex Ionescu What is tip ? ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

19 years, 6 months

RE: [ros-diffs] [ea] 13792: Fix SM\Subsystems\Required andSM\Subsystems\Optional.

by Casper Hornstrup

Why is it needed to expand the unicode characters to hex? ________________________________ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-03-01 22:22:56 UTC (rev 13791) +++ trunk/reactos/bootdata/hivesys.inf 2005-03-01 22:56:51 UTC (rev 13792) @@ -257,10 +257,10 @@ ; Subsystems HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Debug",0x00020000,"" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00070000,"Posix Os2" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00070001,50,00,6f,00,73,00,69,00,78,00,00,00,4f,00,73,00,32,00,00,00,00,00 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Os2",0x00020000,"%SystemRoot%\system32\os2ss.exe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00070000,"Debug Windows" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00070001,44,00,65,00,62,00,75,00,67,00,00,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,00,00,00,00 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe" ; 3Com 3c905 Driver

19 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev March 2005