Ros-diffs June 2008

ros-diffs@reactos.org

23 participants
435 discussions

[ros-arm-bringup] 33977: - Create cmhardwr.c for ARM, stub it out. - Implement KiInitMachineDependent -- this is only useful for x86 and has nothing relevant to ARM, so we just return. - Implement HalAllProcessorsStarted (again, a no-op) and HalQueryRealTimeClock (uses the RTC on the board -- uboot must set it up first). - Make sure we get the right Sp during a system call (this is still broken though). - We need to fix our system call handler next.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jun 15 00:40:27 2008 New Revision: 33977 URL: http://svn.reactos.org/svn/reactos?rev=33977&view=rev Log: - Create cmhardwr.c for ARM, stub it out. - Implement KiInitMachineDependent -- this is only useful for x86 and has nothing relevant to ARM, so we just return. - Implement HalAllProcessorsStarted (again, a no-op) and HalQueryRealTimeClock (uses the RTC on the board -- uboot must set it up first). - Make sure we get the right Sp during a system call (this is still broken though). - We need to fix our system call handler next. Added: trunk/reactos/ntoskrnl/config/arm/ trunk/reactos/ntoskrnl/config/arm/cmhardwr.c - copied, changed from r33932, trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Modified: trunk/reactos/hal/halarm/generic/hal.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ke/arm/kiinit.c trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s trunk/reactos/ntoskrnl/ke/arm/trap.s trunk/reactos/ntoskrnl/ke/arm/trapc.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/hal.c?r… ============================================================================== --- trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] Sun Jun 15 00:40:27 2008 @@ -18,6 +18,7 @@ #include <ndk/iofuncs.h> #include <ndk/kdfuncs.h> #include <ndk/kefuncs.h> +#include <ndk/rtlfuncs.h> #include <internal/arm/ke.h> #include <internal/arm/intrin_i.h> #include <bugcodes.h> @@ -135,13 +136,15 @@ } +/* + * @implemented + */ BOOLEAN NTAPI HalAllProcessorsStarted(VOID) { - UNIMPLEMENTED; - - return TRUE; + /* Do nothing */ + return TRUE; } @@ -733,16 +736,31 @@ UNIMPLEMENTED; } +#define RTC_DATA (PVOID)0xE00E8000 BOOLEAN NTAPI -HalQueryRealTimeClock( - PTIME_FIELDS Time) -{ - UNIMPLEMENTED; - return FALSE; -} - +HalQueryRealTimeClock(IN PTIME_FIELDS Time) +{ + LARGE_INTEGER LargeTime; + ULONG Seconds; + + // + // Query the RTC value + // + Seconds = READ_REGISTER_ULONG(RTC_DATA); + + // + // Convert to time + // + RtlSecondsSince1970ToTime(Seconds, &LargeTime); + + // + // Convert to time-fields + // + RtlTimeToTimeFields(&LargeTime, Time); + return TRUE; +} ULONG NTAPI Copied: trunk/reactos/ntoskrnl/config/arm/cmhardwr.c (from r33932, trunk/reactos/ntoskrnl/config/i386/cmhardwr.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/arm/cmhard… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/arm/cmhardwr.c [iso-8859-1] Sun Jun 15 00:40:27 2008 @@ -1,9 +1,9 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/config/i386/cmhardwr.c - * PURPOSE: Configuration Manager - Hardware-Specific Code - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * FILE: ntoskrnl/config/arm/cmhardwr.c + * PURPOSE: Configuration Manager - ARM Specific Code + * PROGRAMMERS: ReactOS Portable Systems Group */ /* INCLUDES ******************************************************************/ @@ -14,820 +14,12 @@ /* GLOBALS *******************************************************************/ -PCHAR CmpID1 = "80%u86-%c%x"; -PCHAR CmpID2 = "x86 Family %u Model %u Stepping %u"; -PCHAR CmpBiosStrings[] = -{ - "Ver", - "Rev", - "Rel", - "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", - "v 0", "v 1", "v 2", "v 3", "v 4", "v 5", "v 6", "v 7", "v 8", "v 9", - NULL -}; - -PCHAR CmpBiosBegin, CmpBiosSearchStart, CmpBiosSearchEnd; - /* FUNCTIONS *****************************************************************/ - -BOOLEAN -NTAPI -CmpGetBiosDate(IN PCHAR BiosStart, - IN ULONG BiosLength, - IN PCHAR BiosDate, - IN BOOLEAN FromBios) -{ - CHAR LastDate[11] = {0}, CurrentDate[11]; - PCHAR p, pp; - - /* Skip the signature and the magic, and loop the BIOS ROM */ - p = BiosStart + 2; - pp = BiosStart + BiosLength - 5; - while (p < pp) - { - /* Check for xx/yy/zz which we assume to be a date */ - if ((p[0] == '/') && - (p[3] == '/') && - (isdigit(p[-1])) && - (isdigit(p[1])) && - (isdigit(p[2])) && - (isdigit(p[4])) && - (isdigit(p[5]))) - { - /* Copy the string proper */ - RtlMoveMemory(&CurrentDate[5], p - 2, 5); - - /* Add a 0 if the month only has one digit */ - if (!isdigit(CurrentDate[5])) CurrentDate[5] = '0'; - - /* Now copy the year */ - CurrentDate[2] = p[4]; - CurrentDate[3] = p[5]; - CurrentDate[4] = CurrentDate[7] = CurrentDate[10] = ANSI_NULL; - - /* If the date comes from the BIOS, check if it's a 4-digit year */ - if ((FromBios) && - (isdigit(p[6])) && - (isdigit(p[7])) && - ((RtlEqualMemory(&p[4], "19", 2)) || - (RtlEqualMemory(&p[4], "20", 2)))) - { - /* Copy the year proper */ - CurrentDate[0] = p[4]; - CurrentDate[1] = p[5]; - CurrentDate[2] = p[6]; - CurrentDate[3] = p[7]; - } - else - { - /* Otherwise, we'll just assume anything under 80 is 2000 */ - if (strtoul(&CurrentDate[2], NULL, 10) < 80) - { - /* Hopefully your BIOS wasn't made in 1979 */ - CurrentDate[0] = '2'; - CurrentDate[1] = '0'; - } - else - { - /* Anything over 80, was probably made in the 1900s... */ - CurrentDate[0] = '1'; - CurrentDate[1] = '9'; - } - } - - /* Add slashes were we previously had NULLs */ - CurrentDate[4] = CurrentDate[7] = '/'; - - /* Check which date is newer */ - if (memcmp(LastDate, CurrentDate, 10) < 0) - { - /* Found a newer date, select it */ - RtlMoveMemory(LastDate, CurrentDate, 10); - } - - p += 2; - } - p++; - } - - /* Make sure we found a date */ - if (LastDate[0]) - { - /* Copy the year at the pp, and keep only the last two digits */ - RtlMoveMemory(BiosDate, &LastDate[5], 5); - BiosDate[5] = '/'; - BiosDate[6] = LastDate[2]; - BiosDate[7] = LastDate[3]; - BiosDate[8] = ANSI_NULL; - return TRUE; - } - - /* No date found, return empty string */ - BiosDate[0] = ANSI_NULL; - return FALSE; -} - -BOOLEAN -NTAPI -CmpGetBiosVersion(IN PCHAR BiosStart, - IN ULONG BiosLength, - IN PCHAR BiosVersion) -{ - CHAR Buffer[128]; - PCHAR p, pp; - USHORT i; - - /* Check if we were given intitial data for the search */ - if (BiosStart) - { - /* Save it for later use */ - CmpBiosBegin = BiosStart; - CmpBiosSearchStart = BiosStart + 1; - CmpBiosSearchEnd = BiosStart + BiosLength - 2; - } - - /* Now loop the BIOS area */ - for (;;) - { - /* Start an initial search looking for numbers and periods */ - pp = NULL; - while (CmpBiosSearchStart <= CmpBiosSearchEnd) - { - /* Check if we have an "x.y" version string */ - if ((*CmpBiosSearchStart == '.') && - (*(CmpBiosSearchStart + 1) >= '0') && - (*(CmpBiosSearchStart + 1) <= '9') && - (*(CmpBiosSearchStart - 1) >= '0') && - (*(CmpBiosSearchStart - 1) <= '9')) - { - /* Start looking in this area for the actual BIOS Version */ - pp = CmpBiosSearchStart; - break; - } - else - { - /* Keep searching */ - CmpBiosSearchStart++; - } - } - - /* Break out if we're went past the BIOS area */ - if (CmpBiosSearchStart > CmpBiosSearchEnd) return FALSE; - - /* Move to the next 2 bytes */ - CmpBiosSearchStart += 2; - - /* Null-terminate our scratch buffer and start the string here */ - Buffer[127] = ANSI_NULL; - p = &Buffer[127]; - - /* Go back one character since we're doing this backwards */ - pp--; - - /* Loop the identifier we found as long as it's valid */ - i = 0; - while ((i++ < 127) && - (pp >= CmpBiosBegin) && - (*pp >= ' ') && - (*pp != '$')) - { - /* Copy the character */ - *--p = *pp--; - } - - /* Go past the last character since we went backwards */ - pp++; - - /* Loop the strings we recognize */ - for (i = 0; CmpBiosStrings[i]; i++) - { - /* Check if a match was found */ - if (strstr(p, CmpBiosStrings[i])) goto Match; - } - } - -Match: - /* Skip until we find a space */ - for (; *pp == ' '; pp++); - - /* Loop the final string */ - i = 0; - do - { - /* Copy the character into the final string */ - BiosVersion[i] = *pp++; - } while ((++i < 127) && - (pp <= (CmpBiosSearchEnd + 1)) && - (*pp >= ' ') && - (*pp != '$')); - - /* Null-terminate the version string */ - BiosVersion[i] = ANSI_NULL; - return TRUE; -} NTSTATUS NTAPI CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - UNICODE_STRING KeyName, ValueName, Data, SectionName; - OBJECT_ATTRIBUTES ObjectAttributes; - ULONG HavePae, CacheSize, ViewSize, Length, TotalLength = 0, i, Disposition; - NTSTATUS Status; - HANDLE KeyHandle, BiosHandle, SystemHandle, FpuHandle, SectionHandle; - CONFIGURATION_COMPONENT_DATA ConfigData; - CHAR Buffer[128]; - ULONG ExtendedId, Dummy; - PKPRCB Prcb; - USHORT IndexTable[MaximumType + 1] = {0}; - ANSI_STRING TempString; - PCHAR PartialString = NULL, BiosVersion; - CHAR CpuString[48]; - PVOID BaseAddress = NULL; - LARGE_INTEGER ViewBase = {{0}}; - ULONG_PTR VideoRomBase; - PCHAR CurrentVersion; - extern UNICODE_STRING KeRosProcessorName, KeRosBiosDate, KeRosBiosVersion; - extern UNICODE_STRING KeRosVideoBiosDate, KeRosVideoBiosVersion; - - /* Open the SMSS Memory Management key */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\" - L"Control\\Session Manager\\Memory Management"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenKey(&KeyHandle, KEY_READ | KEY_WRITE, &ObjectAttributes); - if (NT_SUCCESS(Status)) - { - /* Detect if PAE is enabled */ - HavePae = SharedUserData->ProcessorFeatures[PF_PAE_ENABLED]; - - /* Set the value */ - RtlInitUnicodeString(&ValueName, L"PhysicalAddressExtension"); - NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_DWORD, - &HavePae, - sizeof(HavePae)); - - /* Close the key */ - NtClose(KeyHandle); - } - - /* Open the hardware description key */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\Hardware\\Description\\System"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenKey(&SystemHandle, KEY_READ | KEY_WRITE, &ObjectAttributes); - if (!NT_SUCCESS(Status)) return Status; - - /* Create the BIOS Information key */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\" - L"Control\\BIOSINFO"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtCreateKey(&BiosHandle, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - &Disposition); - if (ExpInTextModeSetup) - { - if (!NT_SUCCESS(Status)) - BiosHandle = NULL; - } - else if (!NT_SUCCESS(Status)) - return Status; - - /* Create the CPU Key, and check if it already existed */ - RtlInitUnicodeString(&KeyName, L"CentralProcessor"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - SystemHandle, - NULL); - Status = NtCreateKey(&KeyHandle, - KEY_READ | KEY_WRITE, - &ObjectAttributes, - 0, - NULL, - 0, - &Disposition); - NtClose(KeyHandle); - - /* The key shouldn't already exist */ - if (Disposition == REG_CREATED_NEW_KEY) - { - /* Allocate the configuration data for cmconfig.c */ - CmpConfigurationData = ExAllocatePoolWithTag(PagedPool, - CmpConfigurationAreaSize, - TAG_CM); - if (!CmpConfigurationData) return STATUS_INSUFFICIENT_RESOURCES; - - /* Loop all CPUs */ - for (i = 0; i < KeNumberProcessors; i++) - { - /* Get the PRCB */ - Prcb = KiProcessorBlock[i]; - - /* Setup the Configuration Entry for the Processor */ - RtlZeroMemory(&ConfigData, sizeof (ConfigData)); - ConfigData.ComponentEntry.Class = ProcessorClass; - ConfigData.ComponentEntry.Type = CentralProcessor; - ConfigData.ComponentEntry.Key = i; - ConfigData.ComponentEntry.AffinityMask = AFFINITY_MASK(i); - ConfigData.ComponentEntry.Identifier = Buffer; - - /* Check if the CPU doesn't support CPUID */ - if (!Prcb->CpuID) - { - /* Build ID1-style string for older CPUs */ - sprintf(Buffer, - CmpID1, - Prcb->CpuType, - (Prcb->CpuStep >> 8) + 'A', - Prcb->CpuStep & 0xff); - } - else - { - /* Build ID2-style string for newer CPUs */ - sprintf(Buffer, - CmpID2, - Prcb->CpuType, - (Prcb->CpuStep >> 8), - Prcb->CpuStep & 0xff); - } - - /* Save the ID string length now that we've created it */ - ConfigData.ComponentEntry.IdentifierLength = strlen(Buffer) + 1; - - /* Initialize the registry configuration node for it */ - Status = CmpInitializeRegistryNode(&ConfigData, - SystemHandle, - &KeyHandle, - InterfaceTypeUndefined, - 0xFFFFFFFF, - IndexTable); - if (!NT_SUCCESS(Status)) return(Status); - - /* Check if we have an FPU */ - if (KeI386NpxPresent) - { - /* Setup the Configuration Entry for the FPU */ - RtlZeroMemory(&ConfigData, sizeof(ConfigData)); - ConfigData.ComponentEntry.Class = ProcessorClass; - ConfigData.ComponentEntry.Type = FloatingPointProcessor; - ConfigData.ComponentEntry.Key = i; - ConfigData.ComponentEntry.AffinityMask = AFFINITY_MASK(i); - ConfigData.ComponentEntry.Identifier = Buffer; - - /* For 386 cpus, the CPU pp is the identifier */ - if (Prcb->CpuType == 3) strcpy(Buffer, "80387"); - - /* Save the ID string length now that we've created it */ - ConfigData.ComponentEntry.IdentifierLength = strlen(Buffer) + 1; - - /* Initialize the registry configuration node for it */ - Status = CmpInitializeRegistryNode(&ConfigData, - SystemHandle, - &FpuHandle, - InterfaceTypeUndefined, - 0xFFFFFFFF, - IndexTable); - if (!NT_SUCCESS(Status)) - { - /* Failed, close the CPU handle and return */ - NtClose(KeyHandle); - return Status; - } - - /* Close this new handle */ - NtClose(FpuHandle); - - /* Stay on this CPU only */ - KeSetSystemAffinityThread(Prcb->SetMember); - if (!Prcb->CpuID) - { - /* Uh oh, no CPUID! */ - } - else - { - /* Check if we have extended CPUID that supports name ID */ - Ki386Cpuid(0x80000000, &ExtendedId, &Dummy, &Dummy, &Dummy); - if (ExtendedId >= 0x80000004) - { - /* Do all the CPUIDs requred to get the full name */ - PartialString = CpuString; - for (ExtendedId = 2; ExtendedId <= 4; ExtendedId++) - { - /* Do the CPUID and save the name string */ - Ki386Cpuid(0x80000000 | ExtendedId, - (PULONG)PartialString, - (PULONG)PartialString + 1, - (PULONG)PartialString + 2, - (PULONG)PartialString + 3); - - /* Go to the next name string */ - PartialString += 16; - } - - /* Null-terminate it */ - CpuString[47] = ANSI_NULL; - } - } - - /* Get the cache size while we're still localized */ - CacheSize = ((PKIPCR)KeGetPcr())->SecondLevelCacheSize; - - /* Go back to user affinity */ - KeRevertToUserAffinityThread(); - - /* Check if we have a CPU Name */ - if (PartialString) - { - /* Convert it to Unicode */ - RtlInitAnsiString(&TempString, CpuString); - RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); - - /* Add it to the registry */ - RtlInitUnicodeString(&ValueName, L"ProcessorNameString"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - Data.Buffer, - Data.Length + sizeof(UNICODE_NULL)); - - /* ROS: Save a copy for bugzilla reporting */ - RtlCreateUnicodeString(&KeRosProcessorName, Data.Buffer); - - /* Free the temporary buffer */ - RtlFreeUnicodeString(&Data); - } - - /* Check if we had a Vendor ID */ - if (Prcb->VendorString) - { - /* Convert it to Unicode */ - RtlInitAnsiString(&TempString, Prcb->VendorString); - RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); - - /* Add it to the registry */ - RtlInitUnicodeString(&ValueName, L"VendorIdentifier"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - Data.Buffer, - Data.Length + sizeof(UNICODE_NULL)); - - /* Free the temporary buffer */ - RtlFreeUnicodeString(&Data); - } - - /* Check if we have features bits */ - if (Prcb->FeatureBits) - { - /* Add them to the registry */ - RtlInitUnicodeString(&ValueName, L"FeatureSet"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_DWORD, - &Prcb->FeatureBits, - sizeof(Prcb->FeatureBits)); - } - - /* Check if we detected the CPU Speed */ - if (Prcb->MHz) - { - /* Add it to the registry */ - RtlInitUnicodeString(&ValueName, L"~MHz"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_DWORD, - &Prcb->MHz, - sizeof(Prcb->MHz)); - } - - /* Check if we have an update signature */ - if (Prcb->UpdateSignature.QuadPart) - { - /* Add it to the registry */ - RtlInitUnicodeString(&ValueName, L"Update Signature"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_BINARY, - &Prcb->UpdateSignature, - sizeof(Prcb->UpdateSignature)); - } - - /* Close the processor handle */ - NtClose(KeyHandle); - - /* FIXME: Detect CPU mismatches */ - } - } - - /* Free the configuration data */ - ExFreePool(CmpConfigurationData); - } - - /* Open physical memory */ - RtlInitUnicodeString(&SectionName, L"\\Device\\PhysicalMemory"); - InitializeObjectAttributes(&ObjectAttributes, - &SectionName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenSection(&SectionHandle, - SECTION_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) goto Quickie; - - /* Map the first 1KB of memory to get the IVT */ - ViewSize = PAGE_SIZE; - Status = ZwMapViewOfSection(SectionHandle, - NtCurrentProcess(), - &BaseAddress, - 0, - ViewSize, - &ViewBase, - &ViewSize, - ViewUnmap, - MEM_DOS_LIM, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - /* Assume default */ - VideoRomBase = 0xC0000; - } - else - { - /* Calculate the base address from the vector */ - VideoRomBase = (*((PULONG)BaseAddress + 0x10) >> 12) & 0xFFFF0; - VideoRomBase += *((PULONG)BaseAddress + 0x10) & 0xFFF0; - - /* Now get to the actual ROM Start and make sure it's not invalid*/ - VideoRomBase &= 0xFFFF8000; - if (VideoRomBase < 0xC0000) VideoRomBase = 0xC0000; - - /* And unmap the section */ - ZwUnmapViewOfSection(NtCurrentProcess(), BaseAddress); - } - - /* Allocate BIOS Version pp Buffer */ - BiosVersion = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); - - /* Setup settings to map the 64K BIOS ROM */ - BaseAddress = 0; - ViewSize = 16 * PAGE_SIZE; - ViewBase.LowPart = 0xF0000; - ViewBase.HighPart = 0; - - /* Map it */ - Status = ZwMapViewOfSection(SectionHandle, - NtCurrentProcess(), - &BaseAddress, - 0, - ViewSize, - &ViewBase, - &ViewSize, - ViewUnmap, - MEM_DOS_LIM, - PAGE_READWRITE); - if (NT_SUCCESS(Status)) - { - /* Scan the ROM to get the BIOS Date */ - if (CmpGetBiosDate(BaseAddress, 16 * PAGE_SIZE, Buffer, TRUE)) - { - /* Convert it to Unicode */ - RtlInitAnsiString(&TempString, Buffer); - RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); - - /* Write the date into the registry */ - RtlInitUnicodeString(&ValueName, L"SystemBiosDate"); - Status = NtSetValueKey(SystemHandle, - &ValueName, - 0, - REG_SZ, - Data.Buffer, - Data.Length + sizeof(UNICODE_NULL)); - - /* Free the string */ - RtlFreeUnicodeString(&Data); - - if (BiosHandle) - { - /* Get the BIOS Date Identifier */ - RtlCopyMemory(Buffer, (PCHAR)BaseAddress + (16*PAGE_SIZE - 11), 8); - Buffer[8] = ANSI_NULL; - - /* Convert it to unicode */ - RtlInitAnsiString(&TempString, Buffer); - Status = RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); - if (NT_SUCCESS(Status)) - { - /* Save it to the registry */ - Status = NtSetValueKey(BiosHandle, - &ValueName, - 0, - REG_SZ, - Data.Buffer, - Data.Length + sizeof(UNICODE_NULL)); - - /* ROS: Save a copy for bugzilla reporting */ - RtlCreateUnicodeString(&KeRosBiosDate, Data.Buffer); - - /* Free the string */ - RtlFreeUnicodeString(&Data); - } - - /* Close the bios information handle */ - NtClose(BiosHandle); - } - } - - /* Get the BIOS Version */ - if (CmpGetBiosVersion(BaseAddress, 16* PAGE_SIZE, Buffer)) - { - /* Start at the beginning of our buffer */ - CurrentVersion = BiosVersion; - do - { - /* Convert to Unicode */ - RtlInitAnsiString(&TempString, Buffer); - RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); - - /* Calculate the length of this string and copy it in */ - Length = Data.Length + sizeof(UNICODE_NULL); - RtlMoveMemory(CurrentVersion, Data.Buffer, Length); - - /* Free the unicode string */ - RtlFreeUnicodeString(&Data); - - /* Update the total length and see if we're out of space */ - TotalLength += Length; - if (TotalLength + 256 + sizeof(UNICODE_NULL) > PAGE_SIZE) - { - /* One more string would push us out, so stop here */ - break; - } - - /* Go to the next string inside the multi-string buffer */ - CurrentVersion += Length; - - /* Query the next BIOS Version */ - } while (CmpGetBiosVersion(NULL, 0, Buffer)); - - /* Check if we found any strings at all */ - if (TotalLength) - { - /* Add the final null-terminator */ - *(PWSTR)CurrentVersion = UNICODE_NULL; - TotalLength += sizeof(UNICODE_NULL); - - /* Write the BIOS Version to the registry */ - RtlInitUnicodeString(&ValueName, L"SystemBiosVersion"); - Status = NtSetValueKey(SystemHandle, - &ValueName, - 0, - REG_MULTI_SZ, - BiosVersion, - TotalLength); - - /* ROS: Save a copy for bugzilla reporting */ - RtlCreateUnicodeString(&KeRosBiosVersion, (PWCH)BiosVersion); - } - } - - /* Unmap the section */ - ZwUnmapViewOfSection(NtCurrentProcess(), BaseAddress); - } - - /* Now prepare for Video BIOS Mapping of 32KB */ - BaseAddress = 0; - ViewSize = 8 * PAGE_SIZE; - ViewBase.LowPart = VideoRomBase; - ViewBase.HighPart = 0; - - /* Map it */ - Status = ZwMapViewOfSection(SectionHandle, - NtCurrentProcess(), - &BaseAddress, - 0, - ViewSize, - &ViewBase, - &ViewSize, - ViewUnmap, - MEM_DOS_LIM, - PAGE_READWRITE); - if (NT_SUCCESS(Status)) - { - /* Scan the ROM to get the BIOS Date */ - if (CmpGetBiosDate(BaseAddress, 8 * PAGE_SIZE, Buffer, FALSE)) - { - /* Convert it to Unicode */ - RtlInitAnsiString(&TempString, Buffer); - RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); - - /* Write the date into the registry */ - RtlInitUnicodeString(&ValueName, L"VideoBiosDate"); - Status = NtSetValueKey(SystemHandle, - &ValueName, - 0, - REG_SZ, - Data.Buffer, - Data.Length + sizeof(UNICODE_NULL)); - - /* ROS: Save a copy for bugzilla reporting */ - RtlCreateUnicodeString(&KeRosVideoBiosDate, Data.Buffer); - - /* Free the string */ - RtlFreeUnicodeString(&Data); - } - - /* Get the Video BIOS Version */ - if (CmpGetBiosVersion(BaseAddress, 8* PAGE_SIZE, Buffer)) - { - /* Start at the beginning of our buffer */ - CurrentVersion = BiosVersion; - do - { - /* Convert to Unicode */ - RtlInitAnsiString(&TempString, Buffer); - RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); - - /* Calculate the length of this string and copy it in */ - Length = Data.Length + sizeof(UNICODE_NULL); - RtlMoveMemory(CurrentVersion, Data.Buffer, Length); - - /* Free the unicode string */ - RtlFreeUnicodeString(&Data); - - /* Update the total length and see if we're out of space */ - TotalLength += Length; - if (TotalLength + 256 + sizeof(UNICODE_NULL) > PAGE_SIZE) - { - /* One more string would push us out, so stop here */ - break; - } - - /* Go to the next string inside the multi-string buffer */ - CurrentVersion += Length; - - /* Query the next BIOS Version */ - } while (CmpGetBiosVersion(NULL, 0, Buffer)); - - /* Check if we found any strings at all */ - if (TotalLength) - { - /* Add the final null-terminator */ - *(PWSTR)CurrentVersion = UNICODE_NULL; - TotalLength += sizeof(UNICODE_NULL); - - /* Write the BIOS Version to the registry */ - RtlInitUnicodeString(&ValueName, L"VideoBiosVersion"); - Status = NtSetValueKey(SystemHandle, - &ValueName, - 0, - REG_MULTI_SZ, - BiosVersion, - TotalLength); - - /* ROS: Save a copy for bugzilla reporting */ - RtlCreateUnicodeString(&KeRosVideoBiosVersion, (PWCH)BiosVersion); - } - } - - /* Unmap the section */ - ZwUnmapViewOfSection(NtCurrentProcess(), BaseAddress); - } - - /* Close the section */ - ZwClose(SectionHandle); - - /* Free the BIOS version string buffer */ - if (BiosVersion) ExFreePool(BiosVersion); - -Quickie: - /* Close the procesor handle */ - NtClose(KeyHandle); - return STATUS_SUCCESS; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=339… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sun Jun 15 00:40:27 2008 @@ -1265,12 +1265,6 @@ OBJECT_ATTRIBUTES ObjectAttributes; HANDLE KeyHandle, OptionHandle; PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; -#ifdef _ARM_ - DPRINT1("*** Phase 1 Initialization Thread\n"); - DPRINT1("Beginning consistency checks...\n"); - // CHECK STACKS, IRQLS, DISPATCHER AND MAKE SURE WE ARE GOOD TO GO! - //while (TRUE); -#endif /* Allocate the initialization buffer */ InitBuffer = ExAllocatePoolWithTag(NonPagedPool, Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] Sun Jun 15 00:40:27 2008 @@ -38,6 +38,16 @@ // void arm_kprintf(const char *fmt, ...); arm_kprintf("%s", Buffer); +} + +VOID +NTAPI +KiInitMachineDependent(VOID) +{ + // + // There is nothing to do on ARM + // + return; } VOID Modified: trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs_asm.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] Sun Jun 15 00:40:27 2008 @@ -45,9 +45,7 @@ GENERATE_ARM_STUB KiDispatchException GENERATE_ARM_STUB KiSwapProcess GENERATE_ARM_STUB KeSwitchKernelStack -GENERATE_ARM_STUB KiInitMachineDependent GENERATE_ARM_STUB KiComputeTimerTableIndex -GENERATE_ARM_STUB CmpInitializeMachineDependentConfiguration // // Traps, Debugging and Execeptions Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trap.s?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] Sun Jun 15 00:40:27 2008 @@ -400,7 +400,7 @@ cmp r6, #4 //strne sp, [r5], #4 //subne r6, r6, #1 - beq . + bge . // // Now do the system call Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Sun Jun 15 00:40:27 2008 @@ -492,13 +492,27 @@ if (ArgumentCount > 4) { // - // FIXME: Validate the user stack - // - + // Check where the stack is + // + if (Thread->PreviousMode == UserMode) + { + // + // FIXME: Validate the user stack + // + Argument = (PULONG)TrapFrame->UserSp; + } + else + { + // + // We were called from the kernel + // + Argument = (PULONG)TrapFrame->SvcSp; + } + // // Copy the rest // - Argument = (PULONG)TrapFrame->UserSp; + DPRINT1("Stack: %p\n", Argument); for (i = 4; i < ArgumentCount; i++) { // Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Jun 15 00:40:27 2008 @@ -126,6 +126,11 @@ <file>cmhardwr.c</file> </directory> </if> + <if property="ARCH" value="arm"> + <directory name="arm"> + <file>cmhardwr.c</file> + </directory> + </if> <if property="ARCH" value="powerpc"> <directory name="powerpc"> <file>cmhardwr.c</file>

16 years, 6 months

[ros-arm-bringup] 33976: - Copy/pasted a bunch of code from the i386 bootvid for text output. - Don't implement BitBlt for now. - Add the bootdata font file to the arm bootvid as well. - Not sure how it's possible, but we are seeing text output on the console with this hacked-up code! The ReactOS version string appears... - We are now getting much further in the boot cycle.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jun 14 23:43:22 2008 New Revision: 33976 URL: http://svn.reactos.org/svn/reactos?rev=33976&view=rev Log: - Copy/pasted a bunch of code from the i386 bootvid for text output. - Don't implement BitBlt for now. - Add the bootdata font file to the arm bootvid as well. - Not sure how it's possible, but we are seeing text output on the console with this hacked-up code! The ReactOS version string appears... - We are now getting much further in the boot cycle. Added: trunk/reactos/drivers/base/bootvid/arm/bootdata.c - copied unchanged from r33973, trunk/reactos/drivers/base/bootvid/i386/bootdata.c Modified: trunk/reactos/drivers/base/bootvid/arm/bootvid.c trunk/reactos/drivers/base/bootvid/bootvid.rbuild Modified: trunk/reactos/drivers/base/bootvid/arm/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/arm/b… ============================================================================== --- trunk/reactos/drivers/base/bootvid/arm/bootvid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/arm/bootvid.c [iso-8859-1] Sat Jun 14 23:43:22 2008 @@ -23,6 +23,7 @@ #define WRITE_REGISTER_USHORT(r, v) (*(volatile USHORT *)(r) = (v)) PUSHORT VgaArmBase; +BOOLEAN NextLine = FALSE; UCHAR VidpTextColor = 0xF; ULONG VidpCurrentX = 0; ULONG VidpCurrentY = 0; @@ -102,6 +103,146 @@ WRITE_REGISTER_USHORT(PixelPosition, VidpBuildColor(Color)); } +VOID +NTAPI +DisplayCharacter(CHAR Character, + ULONG Left, + ULONG Top, + ULONG TextColor, + ULONG BackTextColor) +{ + PUCHAR FontChar; + ULONG i, j, XOffset; + + /* Get the font line for this character */ + FontChar = &FontData[Character * 13 - Top]; + + /* Loop each pixel height */ + i = 13; + do + { + /* Loop each pixel width */ + j = 128; + XOffset = Left; + do + { + /* Check if we should draw this pixel */ + if (FontChar[Top] & (UCHAR)j) + { + /* We do, use the given Text Color */ + VidpSetPixel(XOffset, Top, (UCHAR)TextColor); + } + else if (BackTextColor < 16) + { + /* This is a background pixel. We're drawing it unless it's */ + /* transparent. */ + VidpSetPixel(XOffset, Top, (UCHAR)BackTextColor); + } + + /* Increase X Offset */ + XOffset++; + } while (j >>= 1); + + /* Move to the next Y ordinate */ + Top++; + } while (--i); +} + +VOID +NTAPI +VgaScroll(ULONG Scroll) +{ + ULONG Top, Offset; + PUSHORT SourceOffset, DestOffset; + PUSHORT i, j; + + /* Set memory positions of the scroll */ + SourceOffset = &VgaArmBase[(VidpScrollRegion[1] * 80) + (VidpScrollRegion[0] >> 3)]; + DestOffset = &SourceOffset[Scroll * 80]; + + /* Save top and check if it's above the bottom */ + Top = VidpScrollRegion[1]; + if (Top > VidpScrollRegion[3]) return; + + /* Start loop */ + do + { + /* Set number of bytes to loop and start offset */ + Offset = VidpScrollRegion[0] >> 3; + j = SourceOffset; + + /* Check if this is part of the scroll region */ + if (Offset <= (VidpScrollRegion[2] >> 3)) + { + /* Update position */ + i = (PUSHORT)(DestOffset - SourceOffset); + + /* Loop the X axis */ + do + { + /* Write value in the new position so that we can do the scroll */ + WRITE_REGISTER_USHORT(j, READ_REGISTER_USHORT(j + (ULONG_PTR)i)); + + /* Move to the next memory location to write to */ + j++; + + /* Move to the next byte in the region */ + Offset++; + + /* Make sure we don't go past the scroll region */ + } while (Offset <= (VidpScrollRegion[2] >> 3)); + } + + /* Move to the next line */ + SourceOffset += 80; + DestOffset += 80; + + /* Increase top */ + Top++; + + /* Make sure we don't go past the scroll region */ + } while (Top <= VidpScrollRegion[3]); +} + +VOID +NTAPI +PreserveRow(IN ULONG CurrentTop, + IN ULONG TopDelta, + IN BOOLEAN Direction) +{ + PUSHORT Position1, Position2; + ULONG Count; + + /* Check which way we're preserving */ + if (Direction) + { + /* Calculate the position in memory for the row */ + Position1 = &VgaArmBase[CurrentTop * 80]; + Position2 = &VgaArmBase[0x9600]; + } + else + { + /* Calculate the position in memory for the row */ + Position1 = &VgaArmBase[0x9600]; + Position2 = &VgaArmBase[CurrentTop * 80]; + } + + /* Set the count and make sure it's above 0 */ + Count = TopDelta * 80; + if (Count) + { + /* Loop every pixel */ + do + { + /* Write the data back on the other position */ + WRITE_REGISTER_USHORT(Position1, READ_REGISTER_USHORT(Position2)); + + /* Increase both positions */ + Position2++; + Position1++; + } while (--Count); + } +} /* PUBLIC FUNCTIONS **********************************************************/ @@ -279,8 +420,81 @@ NTAPI VidDisplayString(PUCHAR String) { - UNIMPLEMENTED; - while (TRUE); + ULONG TopDelta = 14; + + /* Start looping the string */ + while (*String) + { + /* Treat new-line separately */ + if (*String == '\n') + { + /* Modify Y position */ + VidpCurrentY += TopDelta; + if (VidpCurrentY >= VidpScrollRegion[3]) + { + /* Scroll the view */ + VgaScroll(TopDelta); + VidpCurrentY -= TopDelta; + + /* Preserve row */ + PreserveRow(VidpCurrentY, TopDelta, TRUE); + } + + /* Update current X */ + VidpCurrentX = VidpScrollRegion[0]; + + /* Preseve the current row */ + PreserveRow(VidpCurrentY, TopDelta, FALSE); + } + else if (*String == '\r') + { + /* Update current X */ + VidpCurrentX = VidpScrollRegion[0]; + + /* Check if we're being followed by a new line */ + if (String[1] != '\n') NextLine = TRUE; + } + else + { + /* Check if we had a \n\r last time */ + if (NextLine) + { + /* We did, preserve the current row */ + PreserveRow(VidpCurrentY, TopDelta, TRUE); + NextLine = FALSE; + } + + /* Display this character */ + DisplayCharacter(*String, + VidpCurrentX, + VidpCurrentY, + VidpTextColor, + 16); + VidpCurrentX += 8; + + /* Check if we should scroll */ + if (VidpCurrentX > VidpScrollRegion[2]) + { + /* Update Y position and check if we should scroll it */ + VidpCurrentY += TopDelta; + if (VidpCurrentY > VidpScrollRegion[3]) + { + /* Do the scroll */ + VgaScroll(TopDelta); + VidpCurrentY -= TopDelta; + + /* Save the row */ + PreserveRow(VidpCurrentY, TopDelta, TRUE); + } + + /* Update X */ + VidpCurrentX = VidpScrollRegion[0]; + } + } + + /* Get the next character */ + String++; + } } /* @@ -293,7 +507,7 @@ ULONG Top) { UNIMPLEMENTED; - while (TRUE); + //while (TRUE); } /* Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.rbuild [iso-8859-1] Sat Jun 14 23:43:22 2008 @@ -16,6 +16,7 @@ <if property="ARCH" value="arm"> <directory name="arm"> <file>bootvid.c</file> + <file>bootdata.c</file> </directory> </if> <file>bootvid.rc</file>

16 years, 6 months

[ros-arm-bringup] 33975: - Implement VidSolidColorFill, VidSetScrollRegion and VidSetTextColor - Fix a bug in VidpBuildColor

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jun 14 23:11:21 2008 New Revision: 33975 URL: http://svn.reactos.org/svn/reactos?rev=33975&view=rev Log: - Implement VidSolidColorFill, VidSetScrollRegion and VidSetTextColor - Fix a bug in VidpBuildColor Modified: trunk/reactos/drivers/base/bootvid/arm/bootvid.c Modified: trunk/reactos/drivers/base/bootvid/arm/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/arm/b… ============================================================================== --- trunk/reactos/drivers/base/bootvid/arm/bootvid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/arm/bootvid.c [iso-8859-1] Sat Jun 14 23:11:21 2008 @@ -23,6 +23,16 @@ #define WRITE_REGISTER_USHORT(r, v) (*(volatile USHORT *)(r) = (v)) PUSHORT VgaArmBase; +UCHAR VidpTextColor = 0xF; +ULONG VidpCurrentX = 0; +ULONG VidpCurrentY = 0; +ULONG VidpScrollRegion[4] = +{ + 0, + 0, + 640 - 1, + 480 - 1 +}; typedef struct _VGA_COLOR { @@ -69,7 +79,7 @@ // // Build the 16-bit color mask // - return ((Blue & 0x1F) << 11) | ((Green & 0x1F) << 6) | ((Red & 0x1F)); + return ((Red & 0x1F) << 11) | ((Green & 0x1F) << 6) | ((Blue & 0x1F)); } @@ -182,9 +192,18 @@ NTAPI VidSetTextColor(ULONG Color) { - UNIMPLEMENTED; - while (TRUE); - return 0; + UCHAR OldColor; + + // + // Save the old, set the new + // + OldColor = VidpTextColor; + VidpTextColor = Color; + + // + // Return the old text color + // + return OldColor; } /* @@ -211,8 +230,19 @@ ULONG x2, ULONG y2) { - UNIMPLEMENTED; - while (TRUE); + /* Assert alignment */ + ASSERT((x1 & 0x7) == 0); + ASSERT((x2 & 0x7) == 7); + + /* Set Scroll Region */ + VidpScrollRegion[0] = x1; + VidpScrollRegion[1] = y1; + VidpScrollRegion[2] = x2; + VidpScrollRegion[3] = y2; + + /* Set current X and Y */ + VidpCurrentX = x1; + VidpCurrentY = y1; } /* @@ -293,6 +323,22 @@ IN ULONG Bottom, IN UCHAR Color) { - UNIMPLEMENTED; - while (TRUE); -} + int y, x; + + // + // Loop along the Y-axis + // + for (y = Top; y <= Bottom; y++) + { + // + // Loop along the X-axis + // + for (x = Left; x <= Right; x++) + { + // + // Draw the pixel + // + VidpSetPixel(x, y, Color); + } + } +}

16 years, 6 months

[ros-arm-bringup] 33974: - Fix a bug in MmGetPhysicalAddress. - Don't hang in the clock interrupt anymore, for now we'll just ignore it (but it works! :D) - Make all unimplemented bootvid functions hang the system, so we can better stop at progress-points. - Implement VidInitialize: - We allocate a 640x480@16bpp framebuffer using contiguous physical memory (our MMU code survives!). - We setup the LCD controller timings and framebuffer address. - We enable the LCD - For debugging, we're also draw

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jun 14 22:32:52 2008 New Revision: 33974 URL: http://svn.reactos.org/svn/reactos?rev=33974&view=rev Log: - Fix a bug in MmGetPhysicalAddress. - Don't hang in the clock interrupt anymore, for now we'll just ignore it (but it works! :D) - Make all unimplemented bootvid functions hang the system, so we can better stop at progress-points. - Implement VidInitialize: - We allocate a 640x480@16bpp framebuffer using contiguous physical memory (our MMU code survives!). - We setup the LCD controller timings and framebuffer address. - We enable the LCD - For debugging, we're also drawing a nice little test pattern... and it works! We have GUI Code :) Modified: trunk/reactos/drivers/base/bootvid/arm/bootvid.c trunk/reactos/hal/halarm/generic/hal.c trunk/reactos/ntoskrnl/mm/arm/stubs.c Modified: trunk/reactos/drivers/base/bootvid/arm/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/arm/b… ============================================================================== --- trunk/reactos/drivers/base/bootvid/arm/bootvid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/arm/bootvid.c [iso-8859-1] Sat Jun 14 22:32:52 2008 @@ -2,8 +2,97 @@ #define NDEBUG #include "debug.h" +#define LCDTIMING0_PPL(x) ((((x) / 16 - 1) & 0x3f) << 2) +#define LCDTIMING1_LPP(x) (((x) & 0x3ff) - 1) +#define LCDCONTROL_LCDPWR (1 << 11) +#define LCDCONTROL_LCDEN (1) +#define LCDCONTROL_LCDBPP(x) (((x) & 7) << 1) +#define LCDCONTROL_LCDTFT (1 << 5) + +#define PL110_LCDTIMING0 (PVOID)0xE0020000 +#define PL110_LCDTIMING1 (PVOID)0xE0020004 +#define PL110_LCDTIMING2 (PVOID)0xE0020008 +#define PL110_LCDUPBASE (PVOID)0xE0020010 +#define PL110_LCDLPBASE (PVOID)0xE0020014 +#define PL110_LCDCONTROL (PVOID)0xE0020018 + +#define READ_REGISTER_ULONG(r) (*(volatile ULONG * const)(r)) +#define WRITE_REGISTER_ULONG(r, v) (*(volatile ULONG *)(r) = (v)) + +#define READ_REGISTER_USHORT(r) (*(volatile USHORT * const)(r)) +#define WRITE_REGISTER_USHORT(r, v) (*(volatile USHORT *)(r) = (v)) + +PUSHORT VgaArmBase; + +typedef struct _VGA_COLOR +{ + UCHAR Red; + UCHAR Green; + UCHAR Blue; +} VGA_COLOR; + +VGA_COLOR VidpVga8To16BitTransform[16] = +{ + {0x00, 0x00, 0x00}, // Black + {0x00, 0x00, 0x08}, // Blue + {0x00, 0x08, 0x00}, // Green + {0x00, 0x08, 0x08}, // Cyan + {0x08, 0x00, 0x00}, // Red + {0x08, 0x00, 0x08}, // Magenta + {0x08, 0x08, 0x00}, // Brown + {0x10, 0x10, 0x10}, // Light Gray + {0x08, 0x08, 0x08}, // Dark Gray + {0x00, 0x00, 0x1F}, // Light Blue + {0x00, 0x1F, 0x00}, // Light Green + {0x00, 0x1F, 0x1F}, // Light Cyan + {0x1F, 0x00, 0x00}, // Light Red + {0x1F, 0x00, 0x1F}, // Light Magenta + {0x1F, 0x1F, 0x00}, // Yellow + {0x1F, 0x1F, 0x1F}, // White +}; + /* PRIVATE FUNCTIONS *********************************************************/ +USHORT +FORCEINLINE +VidpBuildColor(IN UCHAR Color) +{ + UCHAR Red, Green, Blue; + + // + // Extract color components + // + Red = VidpVga8To16BitTransform[Color].Red; + Green = VidpVga8To16BitTransform[Color].Green; + Blue = VidpVga8To16BitTransform[Color].Blue; + + // + // Build the 16-bit color mask + // + return ((Blue & 0x1F) << 11) | ((Green & 0x1F) << 6) | ((Red & 0x1F)); +} + + +VOID +FORCEINLINE +VidpSetPixel(IN ULONG Left, + IN ULONG Top, + IN UCHAR Color) +{ + PUSHORT PixelPosition; + + // + // Calculate the pixel position + // + PixelPosition = &VgaArmBase[Left + (Top * 640)]; + + // + // Set our color + // + WRITE_REGISTER_USHORT(PixelPosition, VidpBuildColor(Color)); +} + + /* PUBLIC FUNCTIONS **********************************************************/ /* @@ -12,11 +101,67 @@ BOOLEAN NTAPI VidInitialize(IN BOOLEAN SetMode) -{ - DPRINT1("bv-arm\n"); - UNIMPLEMENTED; - while (TRUE); - return FALSE; +{ + PHYSICAL_ADDRESS Physical; + DPRINT1("bv-arm v0.1\n"); + + // + // Allocate framebuffer + // 600kb works out to 640x480@16bpp + // + Physical.QuadPart = -1; + VgaArmBase = MmAllocateContiguousMemory(600 * 1024, Physical); + if (!VgaArmBase) return FALSE; + + // + // Get physical address + // + Physical = MmGetPhysicalAddress(VgaArmBase); + if (!Physical.QuadPart) return FALSE; + DPRINT1("[BV-ARM] Frame Buffer @ 0x%p 0p%p\n", VgaArmBase, Physical.LowPart); + + // + // Set framebuffer address + // + WRITE_REGISTER_ULONG(PL110_LCDUPBASE, Physical.LowPart); + WRITE_REGISTER_ULONG(PL110_LCDLPBASE, Physical.LowPart); + + // + // Initialize timings to 640x480 + // + WRITE_REGISTER_ULONG(PL110_LCDTIMING0, LCDTIMING0_PPL(640)); + WRITE_REGISTER_ULONG(PL110_LCDTIMING1, LCDTIMING1_LPP(480)); + + // + // Enable the LCD Display + // + WRITE_REGISTER_ULONG(PL110_LCDCONTROL, + LCDCONTROL_LCDEN | + LCDCONTROL_LCDTFT | + LCDCONTROL_LCDPWR | + LCDCONTROL_LCDBPP(4)); + +#if DBG + // + // Draw an RGB test pattern + // + int y, x; + for (y = 0; y < 480; y += 40) + { + for (x = 0; x < 640; x++) + { + VidpSetPixel(x, y, 12); + VidpSetPixel(x, y + 10, 9); + VidpSetPixel(x, y + 20, 10); + VidpSetPixel(x, y + 30, 15); + } + } +#endif + + // + // We are done! + // + return TRUE; } /* @@ -27,6 +172,7 @@ VidResetDisplay(IN BOOLEAN HalReset) { UNIMPLEMENTED; + while (TRUE); } /* @@ -37,6 +183,7 @@ VidSetTextColor(ULONG Color) { UNIMPLEMENTED; + while (TRUE); return 0; } @@ -51,6 +198,7 @@ BOOLEAN Transparent) { UNIMPLEMENTED; + while (TRUE); } /* @@ -64,6 +212,7 @@ ULONG y2) { UNIMPLEMENTED; + while (TRUE); } /* @@ -74,6 +223,7 @@ VidCleanUp(VOID) { UNIMPLEMENTED; + while (TRUE); } /* @@ -89,6 +239,7 @@ IN ULONG Delta) { UNIMPLEMENTED; + while (TRUE); } /* @@ -99,6 +250,7 @@ VidDisplayString(PUCHAR String) { UNIMPLEMENTED; + while (TRUE); } /* @@ -111,6 +263,7 @@ ULONG Top) { UNIMPLEMENTED; + while (TRUE); } /* @@ -126,6 +279,7 @@ ULONG Delta) { UNIMPLEMENTED; + while (TRUE); } /* @@ -140,5 +294,5 @@ IN UCHAR Color) { UNIMPLEMENTED; -} - + while (TRUE); +} Modified: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/hal.c?r… ============================================================================== --- trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] Sat Jun 14 22:32:52 2008 @@ -529,9 +529,9 @@ // // Clear the interrupt // - DPRINT1("CLOCK INTERRUPT!!!\n"); + //DPRINT1("CLOCK INTERRUPT!!!\n"); WRITE_REGISTER_ULONG(TIMER_INT_CLEAR, 1); - while (TRUE); + //while (TRUE); } VOID Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Sat Jun 14 22:32:52 2008 @@ -583,7 +583,7 @@ // // Return the information // - ASSERT(PointerPte->u.Hard.L2.Small.Type != SmallPte); + ASSERT(PointerPte->u.Hard.L2.Small.Type == SmallPte); PhysicalAddress.QuadPart = PointerPte->u.Hard.L2.Small.BaseAddress; PhysicalAddress.QuadPart <<= PAGE_SHIFT; PhysicalAddress.LowPart += BYTE_OFFSET(Address);

16 years, 6 months

[ros-arm-bringup] 33973: - Separate bootvid into bootvid/i386 and bootvid/arm (no code change to i386 version). - Stub out all the bootvid functions for ARM, and add an infinite loop so we stop there. - Remove the infinite loop from the HAL -- Hal Initialization is complete. - We must now implement the LCD graphics functions.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jun 14 18:43:45 2008 New Revision: 33973 URL: http://svn.reactos.org/svn/reactos?rev=33973&view=rev Log: - Separate bootvid into bootvid/i386 and bootvid/arm (no code change to i386 version). - Stub out all the bootvid functions for ARM, and add an infinite loop so we stop there. - Remove the infinite loop from the HAL -- Hal Initialization is complete. - We must now implement the LCD graphics functions. Added: trunk/reactos/drivers/base/bootvid/arm/ trunk/reactos/drivers/base/bootvid/arm/bootvid.c (with props) trunk/reactos/drivers/base/bootvid/i386/ trunk/reactos/drivers/base/bootvid/i386/bootdata.c (with props) trunk/reactos/drivers/base/bootvid/i386/bootvid.c (with props) trunk/reactos/drivers/base/bootvid/i386/vga.c (with props) Removed: trunk/reactos/drivers/base/bootvid/bootdata.c trunk/reactos/drivers/base/bootvid/bootvid.c trunk/reactos/drivers/base/bootvid/vga.c Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild trunk/reactos/hal/halarm/generic/hal.c [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/drivers/base/bootvid/arm/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/arm/b… Removed: trunk/reactos/drivers/base/bootvid/bootdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootd… Removed: trunk/reactos/drivers/base/bootvid/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Added: trunk/reactos/drivers/base/bootvid/i386/bootdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… Added: trunk/reactos/drivers/base/bootvid/i386/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… Added: trunk/reactos/drivers/base/bootvid/i386/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… Removed: trunk/reactos/drivers/base/bootvid/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vga.c… Modified: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/hal.c?r…

16 years, 6 months

[tkreuzer] 33972: revert r26384 - this is an old hack to make console output work. We don't need this any longer since freetype / text output is fixed.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jun 14 18:20:22 2008 New Revision: 33972 URL: http://svn.reactos.org/svn/reactos?rev=33972&view=rev Log: revert r26384 - this is an old hack to make console output work. We don't need this any longer since freetype / text output is fixed. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Sat Jun 14 18:20:22 2008 @@ -871,7 +871,7 @@ PWCHAR To; BYTE LastAttribute, Attribute; ULONG CursorX, CursorY, CursorHeight; - HBRUSH CursorBrush, OldBrush, BackgroundBrush; + HBRUSH CursorBrush, OldBrush; HFONT OldFont; Buff = Console->ActiveBuffer; @@ -889,10 +889,6 @@ OldFont = SelectObject(hDC, GuiData->Font); - - BackgroundBrush = CreateSolidBrush(GuiData->ScreenBackground); - FillRect(hDC, rc, BackgroundBrush); - DeleteObject(BackgroundBrush); for (Line = TopLine; Line <= BottomLine; Line++) {

16 years, 6 months

[ros-arm-bringup] 33971: - Dude, we don't need to calibrate anything... we've got a 1MHz timer, which means 1us-precision. KeStallExecutionProcessor needs 1us-precision! - Since we have two timers (ha x86!!!), set the second one as the stall timer. It's a one-shot periodic timer, set to the exact number of microseconds being waited on. - To fully emulate stalling, we don't use a clock interrupt for it (it supports not sending one!) and just busy-loop until the value reaches 0. - Tried it with a

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jun 14 18:19:03 2008 New Revision: 33971 URL: http://svn.reactos.org/svn/reactos?rev=33971&view=rev Log: - Dude, we don't need to calibrate anything... we've got a 1MHz timer, which means 1us-precision. KeStallExecutionProcessor needs 1us-precision! - Since we have two timers (ha x86!!!), set the second one as the stall timer. It's a one-shot periodic timer, set to the exact number of microseconds being waited on. - To fully emulate stalling, we don't use a clock interrupt for it (it supports not sending one!) and just busy-loop until the value reaches 0. - Tried it with a 10 second (10000000 us) wait and it worked -perfectly-. - Re-implemented KeStallExecutionProcessor and got rid of the other code. Back in HalInitSystem(phase1) now... - Also killed some DPRINT1s getting on my nerves. Modified: trunk/reactos/hal/halarm/generic/hal.c trunk/reactos/ntoskrnl/ke/arm/kiinit.c trunk/reactos/ntoskrnl/ke/arm/trapc.c Modified: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/hal.c?r… ============================================================================== --- trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] Sat Jun 14 18:19:03 2008 @@ -498,14 +498,19 @@ #define TIMER_INT_MASK (PVOID)0xE00E2014 #define TIMER_BACKGROUND_LOAD (PVOID)0xE00E2018 +#define TIMER2_LOAD (PVOID)0xE00E3000 +#define TIMER2_VALUE (PVOID)0xE00E3004 +#define TIMER2_CONTROL (PVOID)0xE00E3008 +#define TIMER2_INT_CLEAR (PVOID)0xE00E300C +#define TIMER2_INT_STATUS (PVOID)0xE00E3010 +#define TIMER2_INT_MASK (PVOID)0xE00E3014 +#define TIMER2_BACKGROUND_LOAD (PVOID)0xE00E3018 #define _clz(a) \ ({ ULONG __value, __arg = (a); \ asm ("clz\t%0, %1": "=r" (__value): "r" (__arg)); \ __value; }) -ULONG HalpStallStart, HalpStallEnd, HalpStallScaleFactor; - ULONG HalGetInterruptSource(VOID) { @@ -535,37 +540,7 @@ // // Clear the interrupt // - DPRINT1("STALL INTERRUPT!!!: %lx %lx\n", HalpStallStart, HalpStallEnd); WRITE_REGISTER_ULONG(TIMER_INT_CLEAR, 1); - - // - // Check if this is our first time here - // - if (!(HalpStallStart + HalpStallEnd)) - { - // - // Remember that we've been hit once - // - HalpStallEnd = 1; - } - else if (!(HalpStallStart) && (HalpStallEnd)) - { - // - // Okay, this is our second time here! - // Load the stall execution count that was setup for us... - // And get ready to hit the case below - // - HalpStallStart = PCR->StallExecutionCount; - HalpStallEnd = 0; - } - else if ((HalpStallStart) && !(HalpStallEnd)) - { - // - // This our third time here! - // Now we can just save the stall execution count at end time - // - HalpStallEnd = PCR->StallExecutionCount; - } } VOID @@ -693,6 +668,11 @@ } else if (BootPhase == 1) { + // + // Switch to real clock interrupt + // + PCR->InterruptRoutine[CLOCK2_LEVEL] = HalpClockInterrupt; + UNIMPLEMENTED; while (TRUE); } @@ -1084,23 +1064,33 @@ VOID NTAPI -KeStallExecutionProcessor( - ULONG Microseconds) -{ - ULONG Index; - - // - // Calculate how many times we should loop - // - Index = Microseconds * PCR->StallScaleFactor; - while (Index) - { - // - // Do one stall cycle - // - PCR->StallExecutionCount++; - Index--; - }; +KeStallExecutionProcessor(IN ULONG Microseconds) +{ + // + // Configure the interval to xxx Micrseconds + // (INTERVAL (xxx us) * TIMCLKfreq (1MHz)) + // --------------------------------------- + // (TIMCLKENXdiv (1) * PRESCALEdiv (1)) + // + // This works out great, since 1MHz * 1 us = 1! + // + + // + // Enable the timer + // + WRITE_REGISTER_ULONG(TIMER2_LOAD, Microseconds); + WRITE_REGISTER_ULONG(TIMER2_CONTROL, + 1 << 0 | // one-shot mode + 1 << 1 | // 32-bit mode + 0 << 2 | // 0 stages of prescale, divided by 1 + 0 << 5 | // no interrupt + 1 << 6 | // periodic mode + 1 << 7); // enable it + + // + // Now we will loop until the timer reached 0 + // + while (READ_REGISTER_ULONG(TIMER2_VALUE)); } VOID @@ -1127,7 +1117,7 @@ // Setup the interrupt mask for this IRQL // InterruptMask = KeGetPcr()->IrqlTable[NewIrql]; - DPRINT1("[LOWER] IRQL: %d InterruptMask: %lx\n", NewIrql, InterruptMask); +// DPRINT1("[LOWER] IRQL: %d InterruptMask: %lx\n", NewIrql, InterruptMask); // // Clear interrupts associated to the old IRQL @@ -1172,7 +1162,7 @@ // Setup the interrupt mask for this IRQL // InterruptMask = KeGetPcr()->IrqlTable[NewIrql]; - DPRINT1("[RAISE] IRQL: %d InterruptMask: %lx\n", NewIrql, InterruptMask); + // DPRINT1("[RAISE] IRQL: %d InterruptMask: %lx\n", NewIrql, InterruptMask); ASSERT(NewIrql >= OldIrql); // Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] Sat Jun 14 18:19:03 2008 @@ -52,7 +52,7 @@ LARGE_INTEGER PageDirectory; PKPCR Pcr; ULONG i; - DPRINT1("%s Process: %p Thread: %p Stack: %p PRCB: %p Number: %d LoaderBlock: %p\n", + DPRINT1("[INIT] Process: %p Thread: %p Stack: %p PRCB: %p Number: %d LoaderBlock: %p\n", __FUNCTION__, InitProcess, InitThread, IdleStack, Prcb, Number, LoaderBlock); // Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Sat Jun 14 18:19:03 2008 @@ -333,7 +333,7 @@ // Get the interrupt source // InterruptCause = HalGetInterruptSource(); - DPRINT1("[INT] (%x) @ %p %p\n", InterruptCause, TrapFrame->SvcLr, TrapFrame->Pc); +// DPRINT1("[INT] (%x) @ %p %p\n", InterruptCause, TrapFrame->SvcLr, TrapFrame->Pc); // // Get the new IRQL and Interrupt Mask @@ -354,14 +354,14 @@ // // FIXME: Switch to interrupt stack // - DPRINT1("[ISR]\n"); + //DPRINT1("[ISR]\n"); } else { // // We know this is APC or DPC. // - DPRINT1("[DPC/APC]\n"); + //DPRINT1("[DPC/APC]\n"); HalClearSoftwareInterrupt(Irql); } @@ -369,7 +369,7 @@ // Call the registered interrupt routine // Pcr->InterruptRoutine[Irql](); - DPRINT1("[ISR RETURN]\n"); +// DPRINT1("[ISR RETURN]\n"); // // Re-enable interrupts and return IRQL

16 years, 6 months

[ros-arm-bringup] 33970: - We now implement the idle loop (thanks for fixing the interrupt code...). - We are now back to HalInitSystem just like before the previous fixes. - Now we'll implement stall calibration and switch to the clock interrupt.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jun 14 17:48:30 2008 New Revision: 33970 URL: http://svn.reactos.org/svn/reactos?rev=33970&view=rev Log: - We now implement the idle loop (thanks for fixing the interrupt code...). - We are now back to HalInitSystem just like before the previous fixes. - Now we'll implement stall calibration and switch to the clock interrupt. Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c trunk/reactos/ntoskrnl/ke/arm/trapc.c Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] Sat Jun 14 17:48:30 2008 @@ -22,6 +22,9 @@ #define __ARMV6__ KeIsArmV6 /* FUNCTIONS ******************************************************************/ + +VOID +KiIdleLoop(VOID); VOID DebugService(IN ULONG ServiceType, @@ -495,5 +498,5 @@ // // Jump to idle loop // - while (TRUE); + KiIdleLoop(); } Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Sat Jun 14 17:48:30 2008 @@ -32,6 +32,81 @@ VOID FASTCALL HalClearSoftwareInterrupt(IN KIRQL Request); + +VOID +KiIdleLoop(VOID) +{ + PKPCR Pcr = (PKPCR)KeGetPcr(); + PKPRCB Prcb = Pcr->Prcb; + PKTHREAD OldThread, NewThread; + + // + // Loop forever... that's why this is an idle loop + // + while (TRUE) + { + // + // Cycle interrupts + // + _disable(); + _enable(); + + // + // Check if there's DPC work to do + // + if ((Prcb->DpcData[0].DpcQueueDepth) || + (Prcb->TimerRequest) || + (Prcb->DeferredReadyListHead.Next)) + { + // + // Clear the pending interrupt + // + HalClearSoftwareInterrupt(DISPATCH_LEVEL); + + // + // FIXME: TODO + // + DPRINT1("DPC/Timer Delivery!\n"); + while (TRUE); + } + + // + // Check if there's a thread to schedule + // + if (Prcb->NextThread) + { + // + // Out with the old, in with the new... + // + OldThread = Prcb->CurrentThread; + NewThread = Prcb->NextThread; + Prcb->CurrentThread = NewThread; + Prcb->NextThread = NULL; + + // + // Update thread state + // + NewThread->State = Running; + + // + // Swap to the new thread + // On ARM we call KiSwapContext instead of KiSwapContextInternal, + // because we're calling this from C code and not assembly. + // This is similar to how it gets called for unwaiting, on x86 + // + DPRINT1("Swapping context!\n"); + KiSwapContext(OldThread, NewThread); + DPRINT1("Back\n"); + while (TRUE); + } + else + { + // + // FIXME: Wait-For-Interrupt ARM Opcode + // + } + } +} BOOLEAN KiSwapContextInternal(IN PKTHREAD OldThread, @@ -155,20 +230,22 @@ KiDispatchInterrupt(VOID) { PKPCR Pcr; + PKPRCB Prcb; PKTHREAD NewThread, OldThread; // // Get the PCR and disable interrupts // Pcr = (PKPCR)KeGetPcr(); + Prcb = Pcr->Prcb; _disable(); // //Check if we have to deliver DPCs, timers, or deferred threads // - if ((Pcr->Prcb->DpcData[0].DpcQueueDepth) || - (Pcr->Prcb->TimerRequest) || - (Pcr->Prcb->DeferredReadyListHead.Next)) + if ((Prcb->DpcData[0].DpcQueueDepth) || + (Prcb->TimerRequest) || + (Prcb->DeferredReadyListHead.Next)) { // // FIXME: TODO @@ -185,7 +262,7 @@ // // Check for quantum end // - if (Pcr->Prcb->QuantumEnd) + if (Prcb->QuantumEnd) { // // FIXME: TODO @@ -198,15 +275,15 @@ // // Check if we have a thread to swap to // - if (Pcr->Prcb->NextThread) + if (Prcb->NextThread) { // // Next is now current // - OldThread = Pcr->Prcb->CurrentThread; - NewThread = Pcr->Prcb->NextThread; - Pcr->Prcb->CurrentThread = NewThread; - Pcr->Prcb->NextThread = NULL; + OldThread = Prcb->CurrentThread; + NewThread = Prcb->NextThread; + Prcb->CurrentThread = NewThread; + Prcb->NextThread = NULL; // // Update thread states @@ -217,7 +294,7 @@ // // Make the old thread ready // - KxQueueReadyThread(OldThread, Pcr->Prcb); + KxQueueReadyThread(OldThread, Prcb); // // Swap to the new thread @@ -227,6 +304,7 @@ // DPRINT1("Swapping context!\n"); KiSwapContext(OldThread, NewThread); + DPRINT1("Back\n"); while (TRUE); } }

16 years, 6 months

[ros-arm-bringup] 33969: - Implement the basic stall interrupt to be used to calculate the factors for KeStallExecution (using NT MIPS algorithm, hope this will work) - Also written KeStallExecution. - Now, we are back to where we hang before Phase 1 (so Phase 1 doesn't occur anymore). - This hang is because we used to do a DPC here, which isn't good, since IRQL is already at dispatch. - Instead, the correct course of action is to enter the idle loop, which will schedule the phase 1 thread. - Bu

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jun 14 17:28:40 2008 New Revision: 33969 URL: http://svn.reactos.org/svn/reactos?rev=33969&view=rev Log: - Implement the basic stall interrupt to be used to calculate the factors for KeStallExecution (using NT MIPS algorithm, hope this will work) - Also written KeStallExecution. - Now, we are back to where we hang before Phase 1 (so Phase 1 doesn't occur anymore). - This hang is because we used to do a DPC here, which isn't good, since IRQL is already at dispatch. - Instead, the correct course of action is to enter the idle loop, which will schedule the phase 1 thread. - But, we don't have an idle loop yet ;-) Modified: trunk/reactos/hal/halarm/generic/hal.c Modified: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/hal.c?r… ============================================================================== --- trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] Sat Jun 14 17:28:40 2008 @@ -504,6 +504,8 @@ asm ("clz\t%0, %1": "=r" (__value): "r" (__arg)); \ __value; }) +ULONG HalpStallStart, HalpStallEnd, HalpStallScaleFactor; + ULONG HalGetInterruptSource(VOID) { @@ -517,15 +519,53 @@ } VOID -HalpStallInterrupt(VOID) -{ - DPRINT1("STALL INTERRUPT!!!\n"); - +HalpClockInterrupt(VOID) +{ // // Clear the interrupt // + DPRINT1("CLOCK INTERRUPT!!!\n"); WRITE_REGISTER_ULONG(TIMER_INT_CLEAR, 1); while (TRUE); +} + +VOID +HalpStallInterrupt(VOID) +{ + // + // Clear the interrupt + // + DPRINT1("STALL INTERRUPT!!!: %lx %lx\n", HalpStallStart, HalpStallEnd); + WRITE_REGISTER_ULONG(TIMER_INT_CLEAR, 1); + + // + // Check if this is our first time here + // + if (!(HalpStallStart + HalpStallEnd)) + { + // + // Remember that we've been hit once + // + HalpStallEnd = 1; + } + else if (!(HalpStallStart) && (HalpStallEnd)) + { + // + // Okay, this is our second time here! + // Load the stall execution count that was setup for us... + // And get ready to hit the case below + // + HalpStallStart = PCR->StallExecutionCount; + HalpStallEnd = 0; + } + else if ((HalpStallStart) && !(HalpStallEnd)) + { + // + // This our third time here! + // Now we can just save the stall execution count at end time + // + HalpStallEnd = PCR->StallExecutionCount; + } } VOID @@ -553,7 +593,7 @@ // (TIMCLKENXdiv (1) * PRESCALEdiv (1)) // ClockInterval = 0x2710; - + // // Enable the timer // @@ -766,66 +806,22 @@ FASTCALL HalRequestSoftwareInterrupt(IN KIRQL Request) { - ULONG Interrupt = 0; - - // - // Get the interrupt that maches this IRQL level - // - switch (Request) - { - case APC_LEVEL: - - Interrupt = 1 << 1; - break; - - case DISPATCH_LEVEL: - - Interrupt = 1 << 2; - break; - - default: - - ASSERT(FALSE); - } - // // Force a software interrupt // - DPRINT1("About to force interrupt mask: %d\n", Interrupt); - WRITE_REGISTER_ULONG(VICSOFTINT, Interrupt); + DPRINT1("[SOFTINT]: %d\n", Request); + WRITE_REGISTER_ULONG(VICSOFTINT, 1 << Request); } VOID FASTCALL HalClearSoftwareInterrupt(IN KIRQL Request) -{ - ULONG Interrupt = 0; - - // - // Get the interrupt that maches this IRQL level - // - switch (Request) - { - case APC_LEVEL: - - Interrupt = 1 << 1; - break; - - case DISPATCH_LEVEL: - - Interrupt = 1 << 2; - break; - - default: - - ASSERT(FALSE); - } - +{ // // Force a software interrupt // - DPRINT1("About to kill interrupt mask: %d\n", Interrupt); - WRITE_REGISTER_ULONG(VICSOFTINTCLEAR, Interrupt); + DPRINT1("[SOFTINTC] %d\n", Request); + WRITE_REGISTER_ULONG(VICSOFTINTCLEAR, 1 << Request); } VOID @@ -1091,7 +1087,20 @@ KeStallExecutionProcessor( ULONG Microseconds) { - UNIMPLEMENTED; + ULONG Index; + + // + // Calculate how many times we should loop + // + Index = Microseconds * PCR->StallScaleFactor; + while (Index) + { + // + // Do one stall cycle + // + PCR->StallExecutionCount++; + Index--; + }; } VOID

16 years, 6 months

[mkupfer] 33968: - Give listbox in explorer searchprograms dialog i18n column heads (only done for German and English, other language need to be done)

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sat Jun 14 17:21:44 2008 New Revision: 33968 URL: http://svn.reactos.org/svn/reactos?rev=33968&view=rev Log: - Give listbox in explorer searchprograms dialog i18n column heads (only done for German and English, other language need to be done) Modified: trunk/reactos/base/shell/explorer/dialogs/searchprogram.cpp trunk/reactos/base/shell/explorer/explorer-bg.rc trunk/reactos/base/shell/explorer/explorer-bn.rc trunk/reactos/base/shell/explorer/explorer-cn.rc trunk/reactos/base/shell/explorer/explorer-cz.rc trunk/reactos/base/shell/explorer/explorer-de.rc trunk/reactos/base/shell/explorer/explorer-en.rc trunk/reactos/base/shell/explorer/explorer-es.rc trunk/reactos/base/shell/explorer/explorer-fr.rc trunk/reactos/base/shell/explorer/explorer-gr.rc trunk/reactos/base/shell/explorer/explorer-hu.rc trunk/reactos/base/shell/explorer/explorer-id.rc trunk/reactos/base/shell/explorer/explorer-it.rc trunk/reactos/base/shell/explorer/explorer-jp.rc trunk/reactos/base/shell/explorer/explorer-ko.rc trunk/reactos/base/shell/explorer/explorer-nl.rc trunk/reactos/base/shell/explorer/explorer-no.rc trunk/reactos/base/shell/explorer/explorer-pl.rc trunk/reactos/base/shell/explorer/explorer-pt.rc trunk/reactos/base/shell/explorer/explorer-ro.rc trunk/reactos/base/shell/explorer/explorer-ru.rc trunk/reactos/base/shell/explorer/explorer-sk.rc trunk/reactos/base/shell/explorer/explorer-sv.rc trunk/reactos/base/shell/explorer/explorer-uk.rc trunk/reactos/base/shell/explorer/resource.h Modified: trunk/reactos/base/shell/explorer/dialogs/searchprogram.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/dialog… ============================================================================== --- trunk/reactos/base/shell/explorer/dialogs/searchprogram.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/dialogs/searchprogram.cpp [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -93,6 +93,8 @@ _thread(collect_programs_callback, hwnd, this), _sort(_list_ctrl, CompareFunc/*, (LPARAM)this*/) { + TCHAR szTemp[256]; + const size_t nChars = sizeof(szTemp)/sizeof(*szTemp); SetWindowIcon(hwnd, IDI_SEARCH); _resize_mgr.Add(IDC_FILTER, RESIZE_X); @@ -107,18 +109,18 @@ LV_COLUMN column = {LVCF_FMT|LVCF_WIDTH|LVCF_TEXT, LVCFMT_LEFT, 250}; - TCHAR lvColName[] = _T("Name"); - column.pszText = lvColName; + LoadString(g_Globals._hInstance, IDS_NAMECOLUMN, szTemp, nChars); + column.pszText = szTemp; ListView_InsertColumn(_list_ctrl, 0, &column); column.cx = 300; - TCHAR lvColPath[] = _T("Path"); - column.pszText = lvColPath; + LoadString(g_Globals._hInstance, IDS_PATHCOLUMN, szTemp, nChars); + column.pszText = szTemp; ListView_InsertColumn(_list_ctrl, 1, &column); column.cx = 400; - TCHAR lvColMenuPath[] = _T("Menu Path"); - column.pszText = lvColMenuPath; + LoadString(g_Globals._hInstance, IDS_MENUCOLUMN, szTemp, nChars); + column.pszText = szTemp; ListView_InsertColumn(_list_ctrl, 2, &column); ListView_SetExtendedListViewStyleEx(_list_ctrl, LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT); Modified: trunk/reactos/base/shell/explorer/explorer-bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-bg.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-bg.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -381,6 +381,9 @@ IDS_DESKTOPBAR_SETTINGS "Íàñòðîéêè íà ðàáîòíàòà ïëîù" IDS_DESKTOP "Ðàáîòíà ïëîù" IDS_TASKBAR "Çàäà÷íà ëåíòà" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // Bulgarian (Bg) resources Modified: trunk/reactos/base/shell/explorer/explorer-bn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-bn.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-bn.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -378,6 +378,9 @@ IDS_DESKTOPBAR_SETTINGS "W¯Uc wbq¿b" IDS_DESKTOP "W¯Uc" IDS_TASKBAR "Kvh©Kvix `Û" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // Bengali resources Modified: trunk/reactos/base/shell/explorer/explorer-cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-cn.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-cn.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -381,6 +381,9 @@ IDS_DESKTOPBAR_SETTINGS "×ÀÃæÉèÖÃ" IDS_DESKTOP "×ÀÃæ" IDS_TASKBAR "ÈÎÎñÀ¸" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // Chinese (P.R.C.) resources Modified: trunk/reactos/base/shell/explorer/explorer-cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-cz.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-cz.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -381,6 +381,9 @@ IDS_DESKTOPBAR_SETTINGS "Nastavení plochy" IDS_DESKTOP "Plocha" IDS_TASKBAR "Panel úloh" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // Czech resources Modified: trunk/reactos/base/shell/explorer/explorer-de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-de.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-de.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -387,6 +387,9 @@ IDS_DESKTOPBAR_SETTINGS "Desktop-Einstellungen" IDS_DESKTOP "Desktop" IDS_TASKBAR "Taskbar" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Pfad" + IDS_MENUCOLUMN "Menüpfad" END #endif // German (Germany) resources Modified: trunk/reactos/base/shell/explorer/explorer-en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-en.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-en.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -381,6 +381,9 @@ IDS_DESKTOPBAR_SETTINGS "Desktop Settings" IDS_DESKTOP "Desktop" IDS_TASKBAR "Taskbar" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // English (U.S.) resources Modified: trunk/reactos/base/shell/explorer/explorer-es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-es.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-es.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -380,6 +380,9 @@ IDS_DESKTOPBAR_SETTINGS "Configuracion del Escritorio" IDS_DESKTOP "Escritorio" IDS_TASKBAR "Barra de Tareas" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // Spanish (Castilian) resources Modified: trunk/reactos/base/shell/explorer/explorer-fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-fr.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -380,6 +380,9 @@ IDS_DESKTOPBAR_SETTINGS "Paramètres du bureau" IDS_DESKTOP "Bureau" IDS_TASKBAR "Barre de tâches" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // French (France) resources Modified: trunk/reactos/base/shell/explorer/explorer-gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-gr.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-gr.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -380,6 +380,9 @@ IDS_DESKTOPBAR_SETTINGS "Ñõèìßóåéò ÅðéöÜíåéáò Åñãáóßáò" IDS_DESKTOP "ÅðéöÜíåéá Åñãáóßáò" IDS_TASKBAR "ÃñáììÞ åñãáóéþí" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // Greek resources Modified: trunk/reactos/base/shell/explorer/explorer-hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-hu.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-hu.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -381,6 +381,9 @@ IDS_DESKTOPBAR_SETTINGS "Asztal beállításai" IDS_DESKTOP "Asztal" IDS_TASKBAR "Taskbar" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // Hungarian (unknown sub-lang: 0x0) resources Modified: trunk/reactos/base/shell/explorer/explorer-id.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-id.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-id.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -381,6 +381,9 @@ IDS_DESKTOPBAR_SETTINGS "Setelan Desktop" IDS_DESKTOP "Desktop" IDS_TASKBAR "Taskbar" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // Indonesian resources Modified: trunk/reactos/base/shell/explorer/explorer-it.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-it.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-it.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -345,6 +345,9 @@ IDS_DESKTOPBAR_SETTINGS "Impostazioni del Desktop" IDS_DESKTOP "Desktop" IDS_TASKBAR "Taskbar" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // Italian (Neutral) resources Modified: trunk/reactos/base/shell/explorer/explorer-jp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-jp.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-jp.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -381,6 +381,9 @@ IDS_DESKTOPBAR_SETTINGS "fXNgbvÌÝè" IDS_DESKTOP "fXNgbv" IDS_TASKBAR "^XNo[" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // Japanese resources Modified: trunk/reactos/base/shell/explorer/explorer-ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-ko.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -379,6 +379,9 @@ IDS_DESKTOPBAR_SETTINGS "¹ÙÅÁÈ¸é ¼³Á¤" IDS_DESKTOP "¹ÙÅÁÈ¸é" IDS_TASKBAR "ÀÛ¾÷ Ç¥½ÃÁÙ" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // Korean resources by manatails007(www.manatails007.org) Modified: trunk/reactos/base/shell/explorer/explorer-nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-nl.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -381,6 +381,9 @@ IDS_DESKTOPBAR_SETTINGS "Bureaublad instellingen" IDS_DESKTOP "Bureaublad" IDS_TASKBAR "Taakbalk" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // Dutch resources Modified: trunk/reactos/base/shell/explorer/explorer-no.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-no.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-no.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -381,6 +381,9 @@ IDS_DESKTOPBAR_SETTINGS "Skrivebord Innstillinger" IDS_DESKTOP "Skrivebord" IDS_TASKBAR "Oppgavelinje" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // Norwegian (N.O.) resources Modified: trunk/reactos/base/shell/explorer/explorer-pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-pl.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -381,6 +381,9 @@ IDS_DESKTOPBAR_SETTINGS "W³aciwoci pulpitu" IDS_DESKTOP "Pulpit" IDS_TASKBAR "Pasek zadañ" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // Polish (PL) resources Modified: trunk/reactos/base/shell/explorer/explorer-pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-pt.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-pt.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -149,6 +149,9 @@ IDS_DESKTOPBAR_SETTINGS "Desktop Settings" IDS_DESKTOP "Desktop" IDS_TASKBAR "Taskbar" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // Portuguese (Portugal) resources Modified: trunk/reactos/base/shell/explorer/explorer-ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ro.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-ro.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -185,6 +185,9 @@ IDS_DESKTOPBAR_SETTINGS "Desktop Settings" IDS_DESKTOP "Desktop" IDS_TASKBAR "Taskbar" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // Romanian resources Modified: trunk/reactos/base/shell/explorer/explorer-ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-ru.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -381,6 +381,9 @@ IDS_DESKTOPBAR_SETTINGS "Íàñòðîéêè ðàáî÷åãî ñòîëà" IDS_DESKTOP "Ðàáî÷èé ñòîë" IDS_TASKBAR "Ïàíåëü çàäà÷" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // Russian resources Modified: trunk/reactos/base/shell/explorer/explorer-sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-sk.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-sk.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -392,6 +392,9 @@ IDS_DESKTOPBAR_SETTINGS "Nastavenia plochy" IDS_DESKTOP "Pracovná plocha" IDS_TASKBAR "Panel úloh" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // Slovak resources Modified: trunk/reactos/base/shell/explorer/explorer-sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-sv.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-sv.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -376,6 +376,9 @@ IDS_DESKTOPBAR_SETTINGS "Skrivbordsinställningar" IDS_DESKTOP "Skrivbord" IDS_TASKBAR "Aktivitetsfält" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // Swedish resources Modified: trunk/reactos/base/shell/explorer/explorer-uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-uk.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-uk.rc [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -381,6 +381,9 @@ IDS_DESKTOPBAR_SETTINGS "Íàñòðîéêè ðîáî÷îãî ñòîëà" IDS_DESKTOP "Ðîáî÷èé Ñò³ë" IDS_TASKBAR "Ïàíåëü çàâäàíü" + IDS_NAMECOLUMN "Name" + IDS_PATHCOLUMN "Path" + IDS_MENUCOLUMN "Menu path" END #endif // Ukrainian resources Modified: trunk/reactos/base/shell/explorer/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/resour… ============================================================================== --- trunk/reactos/base/shell/explorer/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/resource.h [iso-8859-1] Sat Jun 14 17:21:44 2008 @@ -49,6 +49,9 @@ #define IDS_HIDE_ICONS 44 #define IDS_TERMINATE 45 #define IDS_RESTART 46 +#define IDS_NAMECOLUMN 47 +#define IDS_PATHCOLUMN 48 +#define IDS_MENUCOLUMN 49 #define IDI_REACTOS 100 #define IDI_EXPLORER 101 #define IDI_STARTMENU 102

16 years, 6 months

← Newer
1
...
23
24
25
26
27
28
29
...
44
Older →

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-diffs June 2008