Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ros-arm-bringup] 32318: We now define the cache and id registers in CP15 (C0 Opcode 0 and 1). We now setup ARM cache information in the loader block. We now allocate the kernel, interrupt and abort stacks, as well as the idle thread and process, and boot PRCB. We now allocate the PCR and PDR pages. We now send the command line to the kernel in the LoaderBlock's load options.
by ros-arm-bringup＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: ros-arm-bringup Date: Tue Feb 12 12:41:21 2008 New Revision: 32318 URL: http://svn.reactos.org/svn/reactos?rev=32318&view=rev Log: We now define the cache and id registers in CP15 (C0 Opcode 0 and 1). We now setup ARM cache information in the loader block. We now allocate the kernel, interrupt and abort stacks, as well as the idle thread and process, and boot PRCB. We now allocate the PCR and PDR pages. We now send the command line to the kernel in the LoaderBlock's load options. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h trunk/reactos/ntoskrnl/include/internal/arm/ke.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c Tue Feb 12 12:41:21 2008 @@ -20,6 +20,32 @@ LOADER_PARAMETER_EXTENSION ArmExtension; extern ARM_TRANSLATION_TABLE ArmTranslationTable; extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; + +ULONG SizeBits[] = +{ + -1, // INVALID + -1, // INVALID + 1 << 12, // 4KB + 1 << 13, // 8KB + 1 << 14, // 16KB + 1 << 15, // 32KB + 1 << 16, // 64KB + 1 << 17 // 128KB +}; + +ULONG AssocBits[] = +{ + -1, // INVALID + -1, // INVALID + 4 // 4-way associative +}; + +ULONG LenBits[] = +{ + -1, // INVALID + -1, // INVALID + 8 // 8 words per line (32 bytes) +}; /* FUNCTIONS ******************************************************************/ @@ -115,6 +141,9 @@ VOID ArmPrepareForReactOS(IN BOOLEAN Setup) { + ARM_CACHE_REGISTER CacheReg; + PVOID Base; + // // Initialize the loader block // @@ -153,8 +182,63 @@ // // - // TODO: Setup ARM-specific block - // + // Send the command line + // + ArmLoaderBlock.LoadOptions = reactos_kernel_cmdline; + + // + // Setup cache information + // + CacheReg = KeArmCacheRegisterGet(); + ArmLoaderBlock.u.Arm.FirstLevelDcacheSize = SizeBits[CacheReg.DSize]; + ArmLoaderBlock.u.Arm.FirstLevelDcacheFillSize = LenBits[CacheReg.DLength]; + ArmLoaderBlock.u.Arm.FirstLevelDcacheFillSize <<= 2; + ArmLoaderBlock.u.Arm.FirstLevelIcacheSize = SizeBits[CacheReg.ISize]; + ArmLoaderBlock.u.Arm.FirstLevelIcacheFillSize = LenBits[CacheReg.ILength]; + ArmLoaderBlock.u.Arm.FirstLevelIcacheFillSize <<= 2; + ArmLoaderBlock.u.Arm.SecondLevelDcacheSize = + ArmLoaderBlock.u.Arm.SecondLevelDcacheFillSize = + ArmLoaderBlock.u.Arm.SecondLevelIcacheSize = + ArmLoaderBlock.u.Arm.SecondLevelIcacheFillSize = 0; + + // + // Allocate the Interrupt stack + // + Base = MmAllocateMemoryWithType(KERNEL_STACK_SIZE, LoaderStartupDpcStack); + ArmLoaderBlock.u.Arm.InterruptStack = KSEG0_BASE | (ULONG)Base; + + // + // Allocate the Kernel Boot stack + // + Base = MmAllocateMemoryWithType(KERNEL_STACK_SIZE, LoaderStartupKernelStack); + ArmLoaderBlock.KernelStack = KSEG0_BASE | (ULONG)Base; + + // + // Allocate the Abort stack + // + Base = MmAllocateMemoryWithType(KERNEL_STACK_SIZE, LoaderStartupPanicStack); + ArmLoaderBlock.u.Arm.PanicStack = KSEG0_BASE | (ULONG)Base; + + // + // Allocate the PCRs (1MB each for now!) + // + Base = MmAllocateMemoryWithType(2 * 1024 * 1024, LoaderStartupPcrPage); + ArmLoaderBlock.u.Arm.PcrPage = (ULONG)Base >> TTB_SHIFT; + ArmLoaderBlock.u.Arm.PcrPage2 = ArmLoaderBlock.u.Arm.PcrPage + 1; + + // + // Allocate PDR pages + // + Base = MmAllocateMemoryWithType(3 * 1024 * 1024, LoaderStartupPdrPage); + ArmLoaderBlock.u.Arm.PdrPage = (ULONG)Base >> TTB_SHIFT; + + // + // Set initial PRCB, Thread and Process on the last PDR page + // + Base = (PVOID)((ULONG)Base + 2 * 1024 * 1024); + ArmLoaderBlock.Prcb = KSEG0_BASE | (ULONG)Base; + ArmLoaderBlock.Process = ArmLoaderBlock.Prcb + sizeof(KPRCB); + ArmLoaderBlock.Thread = ArmLoaderBlock.Process + sizeof(EPROCESS); } VOID @@ -176,5 +260,6 @@ // // Initialize paging and load NTOSKRNL // + TuiPrintf("Kernel Command Line: %s\n", ArmLoaderBlock.LoadOptions); ArmSetupPagingAndJump(Magic); } Modified: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h Tue Feb 12 12:41:21 2008 @@ -21,6 +21,26 @@ } FORCEINLINE +ARM_ID_CODE_REGISTER +KeArmIdCodeRegisterGet(VOID) +{ + ARM_ID_CODE_REGISTER Value; + __asm__ __volatile__ ("mrc p15, 0, %0, c0, c0, 0" : "=r"(Value.AsUlong) : : "cc"); + return Value; +} + + +FORCEINLINE +ARM_CACHE_REGISTER +KeArmCacheRegisterGet(VOID) +{ + ARM_CACHE_REGISTER Value; + __asm__ __volatile__ ("mrc p15, 0, %0, c0, c0, 1" : "=r"(Value.AsUlong) : : "cc"); + return Value; +} + + +FORCEINLINE VOID KeArmControlRegisterSet(IN ARM_CONTROL_REGISTER ControlRegister) { Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h Tue Feb 12 12:41:21 2008 @@ -65,6 +65,40 @@ ULONG AsUlong; } ARM_CONTROL_REGISTER, *PARM_CONTROL_REGISTER; +typedef union _ARM_ID_CODE_REGISTER +{ + struct + { + ULONG Revision:4; + ULONG PartNumber:12; + ULONG Architecture:4; + ULONG Variant:4; + ULONG Identifier:8; + }; + ULONG AsUlong; +} ARM_ID_CODE_REGISTER, *PARM_ID_CODE_REGISTER; + +typedef union _ARM_CACHE_REGISTER +{ + struct + { + ULONG ILength:2; + ULONG IMultipler:1; + ULONG IAssociativty:3; + ULONG ISize:4; + ULONG IReserved:2; + ULONG DLength:2; + ULONG DMultipler:1; + ULONG DAssociativty:3; + ULONG DSize:4; + ULONG DReserved:2; + ULONG Separate:1; + ULONG CType:4; + ULONG Reserved:3; + }; + ULONG AsUlong; +} ARM_CACHE_REGISTER, *PARM_CACHE_REGISTER; + typedef enum _ARM_DOMAINS { Domain0,

1 0

[dreimer] 32317: Bug 3053: some slovak translations by Mario Kacmar, kario@szm.sk Bug 3051: Italian resources update by Paolo Devoti, devotip@tiscali.it
by dreimer＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: dreimer Date: Tue Feb 12 11:44:41 2008 New Revision: 32317 URL: http://svn.reactos.org/svn/reactos?rev=32317&view=rev Log: Bug 3053: some slovak translations by Mario Kacmar, kario(a)szm.sk Bug 3051: Italian resources update by Paolo Devoti, devotip(a)tiscali.it Added: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc (with props) trunk/reactos/dll/win32/setupapi/lang/sk-SK.rc (with props) trunk/reactos/dll/win32/user32/lang/it-IT.rc (with props) Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/main/lang/it-IT.rc trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/setupapi/setupapi.rc trunk/reactos/dll/win32/user32/user32.rc Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Tue Feb 12 11:44:41 2008 @@ -584,7 +584,7 @@ { 0, 0, - "Svuotando la cache", + "Svuotamento della cache in corso", TEXT_STATUS }, { @@ -1579,3 +1579,4 @@ + Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc Tue Feb 12 11:44:41 2008 @@ -10,7 +10,7 @@ CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 - LTEXT "Seleziona un immagine da usare come sfondo per il tuo desktop:", + LTEXT "Selezionare un immagine da usare come sfondo per il tuo desktop:", IDC_STATIC, 8, 103, 180, 9 PUSHBUTTON "&Esplora...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 PUSHBUTTON "&Colore...", IDC_COLOR_BUTTON, 188, 177, 50, 15 @@ -99,7 +99,7 @@ CAPTION "Impostazioni" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 + LTEXT "Trascinare le icone dei monitor in modo corrispondente alla disposizione fisica dei vostri monitor.",-1,3,3,240,10 CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "&Schermo:",1820,3,100,30,8 LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 @@ -122,14 +122,14 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Font Size:", -1, 14, 20, 222, 8 + LTEXT "Dimensione font:", -1, 14, 20, 222, 8 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 - GROUPBOX "Compatibility", -1, 7, 67, 237, 97 - LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 - AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 - AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 - AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 + GROUPBOX "Compatibilità", -1, 7, 67, 237, 97 + LTEXT "Alcuni programmi funzionano in modo irregolare se non riavviate il computer dopo una modifica delle impostazioni dei colori.\r\n\nDopo la modifica delle impostazioni dei colori:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Riavviare il computer prima di applicare le nuove impostazioni dei colori.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Applicare le nuove impostazioni dei colori senza riavviare.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Chiedere prima di applicare le nuove impostazioni dei colori.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU @@ -143,7 +143,7 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Colegato", ID_MENU_ATTACHED + MENUITEM "&Collegato", ID_MENU_ATTACHED MENUITEM "&Primario", ID_MENU_PRIMARY MENUITEM SEPARATOR MENUITEM "&Identifica", ID_MENU_IDENTIFY Modified: trunk/reactos/dll/cpl/main/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/main/lang/it-IT.rc Tue Feb 12 11:44:41 2008 @@ -9,16 +9,16 @@ BEGIN GROUPBOX "Ripetizione caratteri", -1, 5, 5, 230, 130 ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15 - LTEXT "Ritardo della ripetizione", -1, 40, 15, 50, 10 + LTEXT "Ritardo della ripetizione", -1, 40, 15, 150, 10 LTEXT "Lungo", -1, 40, 30, 20, 10 LTEXT "Corto", -1, 200, 30, 20, 10 CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17 ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15 - LTEXT "&Frequenza ripetizione", -1, 40, 70, 50, 10 - LTEXT "Lenta", -1, 40, 85, 20, 10 - LTEXT "Veloce", -1, 200, 85, 20, 10 - CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17 - LTEXT "Clicca qui e tieni premuto un tasto per provare la frequenza di ripetizione:", -1, 15, 105, 150, 10 + LTEXT "&Frequenza ripetizione", -1, 40, 60, 150, 10 + LTEXT "Lenta", -1, 40, 75, 20, 10 + LTEXT "Veloce", -1, 200, 75, 20, 10 + CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 75, 130, 17 + LTEXT "Clicca qui e tieni premuto un tasto per provare la frequenza di ripetizione:", -1, 15, 105, 200, 20 EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 115, 200, 15, WS_CHILD | WS_VISIBLE | WS_GROUP GROUPBOX "Frequenza di lampeggio del Cursore:", -1, 5, 145, 230, 50 LTEXT "", IDC_TEXT_CURSOR_BLINK, 20, 165, 1, 8 @@ -59,7 +59,7 @@ LTEXT "Assegna al tasto destro del mouse le funzioni principali come ad esempio la selezione e il trascinamento", -1, 10, 30, 150, 30 GROUPBOX "Velocità del doppio clic", -1, 5, 75, 230, 70 LTEXT "Fai doppio clic sulla cartella per verificare le impostazioni. Se la cartella non si apre o chiude, prova a usare una velocità minore.", -1, 10, 85, 150, 30 - LTEXT "Velocità: Lenta", -1, 10, 120, 90, 8 + LTEXT "Velocità: Lenta", -1, 10, 120, 90, 8 LTEXT "Veloce", -1, 140, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE Modified: trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc Tue Feb 12 11:44:41 2008 @@ -48,19 +48,19 @@ BEGIN GROUPBOX "Riproduzione suoni", -1, 7,7,230,60 ICON IDI_CPLICON, IDI_CPLICON, 15,20,32,32 - LTEXT "&Dispositivo preimpostato:",-1,50,20,80,17 + LTEXT "&Dispositivo preimpostato:",-1,50,20,180,17 COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "&Volume...", IDC_VOLUME1_BTN, 85,47,70,15 PUSHBUTTON "Ava&zate...", IDC_ADV2_BTN, 160,47,70,15 GROUPBOX "Registrazione dei suoni", -1, 7,75,230,60 ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15,88,32,32 - LTEXT "D&ispositivo preimpostato:",-1,50,88,80,17 + LTEXT "D&ispositivo preimpostato:",-1,50,88,180,17 COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "V&olume...", IDC_VOLUME2_BTN, 85,115,70,15 PUSHBUTTON "Avaza&te...", IDC_ADV1_BTN, 160,115,70,15 GROUPBOX "Riproduzione musica MIDI", -1, 7,145,230,60 ICON IDI_CPLICON, IDI_CPLICON, 15,158,32,32 - LTEXT "D&ispositivo preimpostato:",-1,50,158,80,17 + LTEXT "D&ispositivo preimpostato:",-1,50,158,180,17 COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "Volu&me...", IDC_VOLUME3_BTN, 85,185,70,15 PUSHBUTTON "Informazioni su...", IDC_ADV3_BTN, 160,185,70,15 @@ -75,13 +75,13 @@ LTEXT "Queste impostazioni controllano il volume e le impostazioni avanzate della riproduzione e della registrazione vocale per il dispositivo selezionato.",-1,8,7,230,40 GROUPBOX "Riproduzione vocale", -1, 7,37,230,60 ICON IDI_CPLICON, IDI_CPLICON, 15,50,32,32 - LTEXT "D&ispositivo preimpostato:",-1,50,50,80,17 + LTEXT "D&ispositivo preimpostato:",-1,50,50,180,17 COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "&Volume...", IDC_VOLUME4_BTN, 85,77,70,15 PUSHBUTTON "&Avanzate...", IDC_ADV4_BTN, 160,77,70,15 GROUPBOX "Registrazione vocale", -1, 7,105,230,60 ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15,118,32,32 - LTEXT "&Dispositivo preimpostato:",-1,50,118,80,17 + LTEXT "&Dispositivo preimpostato:",-1,50,118,180,17 COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "V&olume...", IDC_VOLUME5_BTN, 85,145,70,15 PUSHBUTTON "Ava&nzate...", IDC_ADV5_BTN, 160,145,70,15 @@ -98,135 +98,135 @@ IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Save Scheme As" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Save this sound scheme as:", -1, 7, 7, 212, 9 +CAPTION "Salvare schema come" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Salvare questo schema di suoni come:", -1, 7, 7, 212, 9 EDITTEXT 8960, 7, 17, 211, 14, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, 93, 36, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 157, 36, 60, 14 + PUSHBUTTON "Annulla", IDCANCEL, 157, 36, 60, 14 END IDD_SPEAKERS DIALOG 0, 0, 257, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Speakers" +CAPTION "Altoparlanti" FONT 8, "MS Shell Dlg" BEGIN ICON 4379, -1, 7, 8, 20, 20 - LTEXT "Select the speaker setup that is most like the setup you have on your computer.", -1, 36, 8, 215, 27 + LTEXT "Selezionare l'assetto degli altoparlanti che assomiglia maggiormenta a quello del vostro computer.", -1, 36, 8, 215, 27 CONTROL 110, 5376, "STATIC", SS_BITMAP | SS_CENTERIMAGE, 37, 40, 209, 112, WS_EX_TRANSPARENT - LTEXT "S&peaker setup:", 8502, 53, 169, 55, 10 + LTEXT "&Assetto degli altoparlanti:", 8502, 53, 169, 55, 10 COMBOBOX 5401, 52, 182, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP END IDD_PERFORMANCE1 DIALOG 0, 0, 257, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Performance" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "These settings control how ReactOS plays audio. They can help you troubleshoot audio-related problems.", 8492, 34, 7, 218, 23 - GROUPBOX "Audio playback", 8494, 7, 32, 243, 152 +CAPTION "Prestazioni" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Queste impostazioni controllano come viene riprodotto il suono da ReactOS. Possono aiutare a individuare problemi relativi all'audio.", 8492, 34, 7, 218, 23 + GROUPBOX "Riproduzione audio", 8494, 7, 32, 243, 152 ICON 4379, 8512, 8, 8, 20, 20 - LTEXT "&Hardware acceleration:", 8495, 13, 56, 111, 14 + LTEXT "Accelerazione &Hardware:", 8495, 13, 56, 111, 14 CONTROL "Slider1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 54, 62, 18 - LTEXT "&Sample rate conversion quality:", 8496, 13, 123, 103, 14 + LTEXT "&Qualita della conversione dei campionamenti:", 8496, 13, 123, 103, 14 CONTROL "Slider1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 121, 62, 18 - PUSHBUTTON "&Restore Defaults", 5400, 7, 191, 110, 14 - LTEXT "None", 8497, 128, 56, 21, 10 - LTEXT "Full", 8498, 214, 56, 21, 9 - LTEXT "Good", 8499, 128, 123, 21, 10 - LTEXT "Best", 8500, 214, 123, 23, 9 - LTEXT "This string describes the hardware setting for the capture device", 5399, 13, 145, 227, 21 - LTEXT "This string describes the hardware setting for the render device", 5398, 13, 78, 227, 22 + PUSHBUTTON "&Ripristinare i valori predefiniti", 5400, 7, 191, 110, 14 + LTEXT "Nessuno", 8497, 128, 56, 21, 10 + LTEXT "Completo", 8498, 214, 56, 21, 9 + LTEXT "Buono", 8499, 128, 123, 21, 10 + LTEXT "Ottimo", 8500, 214, 123, 23, 9 + LTEXT "Questa stringa descrive le impostazioni hardware per il dispositivo di registrazione", 5399, 13, 145, 227, 21 + LTEXT "Questa stringa descrive le impostazioni hardware per il dispositivo di riproduzione", 5398, 13, 78, 227, 22 END IDD_PERFORMANCE2 DIALOG 0, 0, 257, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Performance" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "These settings control how ReactOS records audio. They can help you troubleshoot audio-related problems.", 8492, 34, 7, 217, 20 - GROUPBOX "Audio recording", 8494, 7, 29, 242, 122 +CAPTION "Prestazioni" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Queste impostazioni controllano come viene registrato il suono da ReactOS. Possono aiutare a individuare problemi relativi all'audio.", 8492, 34, 7, 217, 20 + GROUPBOX "Registrazione audio", 8494, 7, 29, 242, 122 ICON 4380, 8512, 8, 7, 20, 20 - LTEXT "&Hardware acceleration:", 8495, 13, 46, 103, 17 + LTEXT "Accelerazione &Hardware:", 8495, 13, 46, 103, 17 CONTROL "Slider1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 43, 62, 18 - LTEXT "&Sample rate conversion quality:", 8496, 13, 103, 103, 17 + LTEXT "&Qualita della conversione dei campionamenti:", 8496, 13, 103, 103, 17 CONTROL "Slider1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 101, 62, 18 - PUSHBUTTON "&Restore Defaults", 5400, 9, 158, 110, 14 - LTEXT "None", 8497, 125, 46, 24, 10 - LTEXT "Full", 8498, 217, 46, 19, 9 - LTEXT "Good", 8499, 125, 103, 24, 10 - LTEXT "Best", 8500, 217, 103, 19, 9 - LTEXT "This string describes the hardware setting for the capture device", 5399, 13, 125, 222, 21 - LTEXT "This string describes the hardware setting for the render device", 5398, 13, 68, 218, 24 + PUSHBUTTON "&Ripristinare i valori predefiniti", 5400, 9, 158, 110, 14 + LTEXT "Nessuno", 8497, 125, 46, 24, 10 + LTEXT "Completo", 8498, 217, 46, 19, 9 + LTEXT "Buono", 8499, 125, 103, 24, 10 + LTEXT "Ottimo", 8500, 217, 103, 19, 9 + LTEXT "Questa stringa descrive le impostazioni hardware per il dispositivo di registrazione", 5399, 13, 145, 227, 21 + LTEXT "Questa stringa descrive le impostazioni hardware per il dispositivo di riproduzione", 5398, 13, 78, 227, 22 END IDD_SETUP1 DIALOG 0, 0, 227, 206 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Setup" +CAPTION "Impostazioni" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "ReactOS Audio", 10243, 7, 5, 213, 192 ICON 4393, 10241, 26, 26, 20, 20 - LTEXT "This computer cannot play audio because the ReactOS Audio service is not enabled.", 10245, 60, 25, 150, 40 - AUTOCHECKBOX "&Enable ReactOS Audio", 10253, 60, 68, 150, 9 - LTEXT "Notes", 10246, 58, 87, 150, 11 - LTEXT "1. You must be an administrator to enable this service. If you are not logged on as administrator, you will be prompted for an administrator name and password.", 10247, 60, 100, 150, 40 - LTEXT "2. After you enable ReactOS Audio you will have to restart the computer.", 10248, 60, 140, 150, 40 + LTEXT "Questo computer non può riprodurre l'audio perchè il servizio ReactOS Audio non è abilitato.", 10245, 60, 25, 150, 40 + AUTOCHECKBOX "&Abilitare ReactOS Audio", 10253, 60, 68, 150, 9 + LTEXT "Note", 10246, 58, 87, 150, 11 + LTEXT "1. Dovete essere un amministratore per abilitare questo servizio. Se non lo siete vi sarà richiesto un nome utente e password di un amministratore.", 10247, 60, 100, 150, 40 + LTEXT "2. Dopo aver abilitato ReactOS Audio dovrete riavviare il computer.", 10248, 60, 140, 150, 40 END IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Multichannel" +CAPTION "Multicanale" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Description goes here.", 9506, 8, 4, 212, 24 - LTEXT "Low", 9473, 65, 31, 14, 8 + LTEXT "Basso", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 - LTEXT "High", 9474, 202, 31, 17, 8 - LTEXT "Low", 9477, 65, 50, 14, 8 + LTEXT "Alto", 9474, 202, 31, 17, 8 + LTEXT "Basso", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 - LTEXT "High", 9478, 202, 50, 17, 8 - LTEXT "Low", 9481, 65, 69, 14, 8 + LTEXT "Alto", 9478, 202, 50, 17, 8 + LTEXT "Basso", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 - LTEXT "High", 9482, 202, 69, 17, 8 - LTEXT "Low", 9485, 65, 88, 14, 8 + LTEXT "Alto", 9482, 202, 69, 17, 8 + LTEXT "Basso", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 - LTEXT "High", 9486, 202, 88, 17, 8 - LTEXT "Low", 9489, 65, 107, 14, 8 + LTEXT "Alto", 9486, 202, 88, 17, 8 + LTEXT "Basso", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 - LTEXT "High", 9490, 202, 107, 17, 8 - LTEXT "Low", 9493, 65, 126, 14, 8 + LTEXT "Alto", 9490, 202, 107, 17, 8 + LTEXT "Basso", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 - LTEXT "High", 9494, 202, 126, 17, 8 - LTEXT "Low", 9497, 65, 145, 14, 8 + LTEXT "Alto", 9494, 202, 126, 17, 8 + LTEXT "Basso", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 - LTEXT "High", 9498, 202, 145, 17, 8 - LTEXT "Low", 9501, 65, 164, 14, 8 + LTEXT "Alto", 9498, 202, 145, 17, 8 + LTEXT "Basso", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 - LTEXT "High", 9502, 202, 164, 17, 8 - AUTOCHECKBOX "&Move all slide indicators at the same time", 9504, 5, 185, 216, 9 - PUSHBUTTON "Restore &Defaults", 9505, 110, 199, 110, 14 + LTEXT "Alto", 9502, 202, 164, 17, 8 + AUTOCHECKBOX "&Muovere tutti i cursori contemporaneamente", 9504, 5, 185, 216, 9 + PUSHBUTTON "&Ripristinare i valori predefiniti", 9505, 110, 199, 110, 14 END IDD_SETUP2 DIALOG 0, 0, 227, 206 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Setup" +CAPTION "Impostazioni" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "ReactOS Audio", 10259, 7, 5, 213, 192 ICON 4394, 10257, 25, 25, 20, 20 - LTEXT "The ReactOS Audio service is now enabled. However, audio may not function properly until you restart ReactOS. If you want to restart now, first save your work and close all programs.", 10261, 60, 25, 150, 50 - LTEXT "To restart ReactOS, click OK.", 10262, 60, 75, 150, 20 - LTEXT "If you Cancel, you will need to restart later for ReactOS Audio to function properly.", 10263, 60, 100, 150, 40 + LTEXT "Il servizio ReactOS Audio è abilitato. Comunque, l'audio potrebbe non funzionare correttamente fino al riavvio di ReactOS. Se volte riavviare ora, salvate il vostro lavoro e chiudete tutti i programmi.", 10261, 60, 25, 150, 50 + LTEXT "Per riavviare ReactOS, cliccare OK.", 10262, 60, 75, 150, 20 + LTEXT "Se cliccherete Annulla, sarà necessario riavviare successivamente perchè ReactOS Audio funzioni corettamente.", 10263, 60, 100, 150, 40 END STRINGTABLE @@ -235,33 +235,33 @@ IDS_CPLDESCRIPTION "Cambia lo schema dei suoni per il tuo computer o configura le impostazioni per gli altoparlanti e i dispositivi di registrazione." IDS_NO_SOUND "(None)" - 5825 "Program error" - 5826 "Close program" - 5827 "Critical Battery Alarm" - 5828 "Device Connect" - 5829 "Device Disconnect" - 5830 "Device Failed to Connect" - 5831 "Empty Recycle Bin" - 5832 "Low Battery Alarm" - 5833 "Maximize" - 5834 "Menu command" + 5825 "Errore del programma" + 5826 "Chiudere il programma" + 5827 "Allarme di batteria critica" + 5828 "Connessione del dispositivo" + 5829 "Disconnessione del dispositivo" + 5830 "Fallimento della connessione del dispositivo" + 5831 "Svuotare cestino" + 5832 "Allarme di batteria bassa" + 5833 "Massimizzare" + 5834 "Menu comandi" 5835 "Menu popup" - 5836 "Minimize" - 5837 "New Mail Notification" - 5838 "Start Navigation" - 5839 "Open program" - 5840 "Print Complete" - 5841 "Restore Down" - 5842 "Restore Up" - 5843 "Asterisk" - 5844 "Default sound" - 5845 "Exclamation" - 5846 "Exit ReactOS" - 5847 "Critical Stop" - 5848 "System Notification" - 5849 "Question" - 5850 "Start ReactOS" - 5851 "Start Menu" - 5852 "ReactOS Logoff" - 5853 "ReactOS Logon" -END + 5836 "Minimizzare" + 5837 "Notifica nuova email" + 5838 "Iniziare avigazione" + 5839 "Aprire programma" + 5840 "Stama completata" + 5841 "Ripristinare giù" + 5842 "Ripristinare su" + 5843 "Asterisco" + 5844 "Suono predefinito" + 5845 "Esclamazione" + 5846 "Uscire da ReactOS" + 5847 "Arresto critico" + 5848 "Notifica del sistema" + 5849 "Domanda" + 5850 "Avvio ReactOS" + 5851 "Menu avvio" + 5852 "Fine sessione di ReactOS" + 5853 "Inizio sessione di ReactOS" +END Added: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sk-SK.rc (added) +++ trunk/reactos/dll/win32/msgina/lang/sk-SK.rc Tue Feb 12 11:44:41 2008 @@ -1,0 +1,60 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 09-02-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Poèkajte, prosím ..." +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + +IDD_NOTICE_DLG DIALOGEX 0,0,186,59 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Vitajte v systéme ReactOS" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + LTEXT "Stlaète kombináciu kláves Control-Alt-Delete",IDC_STATIC,16,18,144,14 +END + +IDD_LOGGEDOUT_DLG DIALOGEX 0,0,275,147 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Prihlásenie" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Zrui",IDCANCEL,115,122,50,14 + PUSHBUTTON "Vypnú",IDC_SHUTDOWN,179,122,50,14 + LTEXT "Meno pouívate¾a:",IDC_STATIC,36,75,40,8 + LTEXT "Heslo:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD + CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME,7,7,261,51 +END + +IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +CAPTION "Bezpeènos" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + PUSHBUTTON "Zrui",IDCANCEL,170,95,70,14 + PUSHBUTTON "Odhlási",IDC_LOGOFF,90,76,70,14 + PUSHBUTTON "Vypnú",IDC_SHUTDOWN,170,76,70,14 + LTEXT "Èo chcete urobi?",IDC_STATIC,86,53,87,8 + PUSHBUTTON "Uzamknú poèítaè",IDC_LOCK,10,76,70,14 + PUSHBUTTON "Správca úloh",IDC_TASKMGR,90,95,70,14 + CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME,7,7,230,38 +END + +STRINGTABLE +BEGIN + IDS_LOGGEDOUTSAS "Vitajte!" + IDS_LOCKEDSAS "Poèítaè je práve uzamknutý." + IDS_PRESSCTRLALTDELETE "Stlaète Control+Alt+Delete pre prihlásenie." + IDS_ASKFORUSER "Meno pouívate¾a: " + IDS_ASKFORPASSWORD "Heslo: " + IDS_FORCELOGOFF "Toto spôsobí odhlásenie aktuálneho pouívate¾a a stratu vetkých neuloených údajov. Chcete pokraèova?" +END Propchange: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rc (original) +++ trunk/reactos/dll/win32/msgina/msgina.rc Tue Feb 12 11:44:41 2008 @@ -18,5 +18,6 @@ #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/uk-UA.rc" #include "lang/es-ES.rc" Added: trunk/reactos/dll/win32/setupapi/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/sk-SK.rc (added) +++ trunk/reactos/dll/win32/setupapi/lang/sk-SK.rc Tue Feb 12 11:44:41 2008 @@ -1,0 +1,24 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 10-02-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Kopírujú sa súbory ..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Zrui", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Zdroj:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Cie¾:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_QUERY_REBOOT_TEXT "Pre dokonèenie intalácie je potrebné retartova poèítaè. Chcete pokraèova?" + IDS_QUERY_REBOOT_CAPTION "Retartova" +END Propchange: trunk/reactos/dll/win32/setupapi/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/setupapi/setupapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.rc (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.rc Tue Feb 12 11:44:41 2008 @@ -42,6 +42,7 @@ #include "lang/pl-PL.rc" #include "lang/pt-PT.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/th-TH.rc" #include "lang/tr-TR.rc" Added: trunk/reactos/dll/win32/user32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/user32/lang/it-IT.rc (added) +++ trunk/reactos/dll/win32/user32/lang/it-IT.rc Tue Feb 12 11:44:41 2008 @@ -1,0 +1,75 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +///////////////////////////////////////////////////////////////////////////// +// +// Dialogs +// + +SELWINDOW DIALOGEX DISCARDABLE 20, 20, 220, 140 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Finestra di selezione" +BEGIN + LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL + PUSHBUTTON "&OK", 1, 60, 120, 40, 15, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Annulla", 2, 120, 120, 40, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +///////////////////////////////////////////////////////////////////////////// +// +// Menus +// + +EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Undo", EM_UNDO + MENUITEM SEPARATOR + MENUITEM "&Taglia", WM_CUT + MENUITEM "&Copia", WM_COPY + MENUITEM "&Incolla", WM_PASTE + MENUITEM "&Rimuovi", WM_CLEAR + MENUITEM SEPARATOR + MENUITEM "&Seleziona tutto", EM_SETSEL + END +END + + +SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE +BEGIN + MENUITEM "&Ripristina", 61728 + MENUITEM "&Muove", 61456 + MENUITEM "&Dimensione", 61440 + MENUITEM "Mi&nimizza", 61472 + MENUITEM "Ma&ssimizza", 61488 + MENUITEM SEPARATOR + MENUITEM "&Chiudi\tAlt-F4", 61536 +END + +///////////////////////////////////////////////////////////////////////////// +// +// Strings +// + +STRINGTABLE +BEGIN + IDS_ERROR, "Errore" + IDS_OK, "OK" + IDS_CANCEL, "Annulla" + IDS_ABORT, "&Interrompi" + IDS_RETRY, "&Riprova" + IDS_IGNORE, "&Ignora" + IDS_YES, "&Si" + IDS_NO, "&No" + IDS_HELP, "Aiuto" + IDS_TRYAGAIN, "&Prova ancora" + IDS_CONTINUE, "&Continua" +END + +STRINGTABLE +BEGIN + IDS_MDI_MOREWINDOWS, "&Altre finestre..." +END + Propchange: trunk/reactos/dll/win32/user32/lang/it-IT.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rc… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rc (original) +++ trunk/reactos/dll/win32/user32/user32.rc Tue Feb 12 11:44:41 2008 @@ -99,3 +99,4 @@ #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/uk-UA.rc" +#include "lang/it-IT.rc"

1 0

[ros-arm-bringup] 32316: Real fix, this time, hopefully.
by ros-arm-bringup＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: ros-arm-bringup Date: Tue Feb 12 09:51:39 2008 New Revision: 32316 URL: http://svn.reactos.org/svn/reactos?rev=32316&view=rev Log: Real fix, this time, hopefully. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h Tue Feb 12 09:51:39 2008 @@ -44,6 +44,8 @@ #define FRAME_EDITED 0xFFF8 #ifndef __ASM__ + +#include "intrin_i.h" #define KeArchFnInit() Ke386FnInit() #define KeArchHaltProcessor() Ke386HaltProcessor()

1 0

[ros-arm-bringup] 32315: Fix for x86 build.
by ros-arm-bringup＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: ros-arm-bringup Date: Tue Feb 12 09:38:41 2008 New Revision: 32315 URL: http://svn.reactos.org/svn/reactos?rev=32315&view=rev Log: Fix for x86 build. Modified: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h trunk/reactos/ntoskrnl/include/internal/arm/ke.h trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h Tue Feb 12 09:38:41 2008 @@ -41,5 +41,4 @@ __asm__ __volatile__ ("mcr p15, 0, %0, c3, c0, 0" : : "r"(DomainRegister.AsUlong) : "cc"); } -#define KeArchHaltProcessor KeArmHaltProcessor #endif Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h Tue Feb 12 09:38:41 2008 @@ -4,6 +4,8 @@ #if __GNUC__ >=3 #pragma GCC system_header #endif + +#define KeArchHaltProcessor() KeArmHaltProcessor() typedef union _ARM_TTB_REGISTER { Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h Tue Feb 12 09:38:41 2008 @@ -410,9 +410,6 @@ #error Unknown compiler for inline assembler #endif -#define KeArchFnInit() Ke386FnInit() -#define KeArchHaltProcessor() Ke386HaltProcessor() - #endif /* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h Tue Feb 12 09:38:41 2008 @@ -44,6 +44,9 @@ #define FRAME_EDITED 0xFFF8 #ifndef __ASM__ + +#define KeArchFnInit() Ke386FnInit() +#define KeArchHaltProcessor() Ke386HaltProcessor() extern ULONG Ke386CacheAlignment;

1 0

[ros-arm-bringup] 32314: The kernel entrypoint is called KiSystemStartup, not NtProcessStartup. On ARM, don't prepend underscore to the kernel entrypoint. We now correctly jump into the kernel entrypoint, instead of random code!
by ros-arm-bringup＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: ros-arm-bringup Date: Tue Feb 12 09:15:35 2008 New Revision: 32314 URL: http://svn.reactos.org/svn/reactos?rev=32314&view=rev Log: The kernel entrypoint is called KiSystemStartup, not NtProcessStartup. On ARM, don't prepend underscore to the kernel entrypoint. We now correctly jump into the kernel entrypoint, instead of random code! Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Tue Feb 12 09:15:35 2008 @@ -2623,9 +2623,10 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s", - module.GetEntryPoint(true).c_str (), - module.baseaddress.c_str () ); + string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s", + module.GetEntryPoint(!(Environment::GetArch() == "arm")).c_str (), + module.baseaddress.c_str () ); + GenerateLinkerCommand ( dependencies, "${gcc}", linkerParameters + " $(NTOSKRNL_SHARED)", Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Tue Feb 12 09:15:35 2008 @@ -1033,7 +1033,7 @@ switch ( type ) { case Kernel: - return "NtProcessStartup"; + return "KiSystemStartup"; case KernelModeDLL: case KernelModeDriver: return "DriverEntry@8";

1 0

[ros-arm-bringup] 32313: Move the entrypoint and startup code in boot.s. Write ksarm.h and kxarm.h headers, defining the ARM Assembly ABI. Rewrite the ARM assembler files we currently have to match the ABI.
by ros-arm-bringup＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: ros-arm-bringup Date: Tue Feb 12 08:55:12 2008 New Revision: 32313 URL: http://svn.reactos.org/svn/reactos?rev=32313&view=rev Log: Move the entrypoint and startup code in boot.s. Write ksarm.h and kxarm.h headers, defining the ARM Assembly ABI. Rewrite the ARM assembler files we currently have to match the ABI. Added: trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h (with props) trunk/reactos/ntoskrnl/include/internal/arm/kxarm.h (with props) trunk/reactos/ntoskrnl/ke/arm/boot.s (with props) Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s Tue Feb 12 08:55:12 2008 @@ -6,29 +6,14 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -/* INCLUDES *******************************************************************/ + .title "ARM FreeLDR Entry Point" + .include "ntoskrnl/include/internal/arm/kxarm.h" + .include "ntoskrnl/include/internal/arm/ksarm.h" -//#include <kxarm.h> - -#define CPSR_IRQ_DISABLE 0x80 -#define CPSR_FIQ_DISABLE 0x40 -#define CPSR_THUMB_ENABLE 0x20 - -#define C1_MMU_CONTROL 0x01 -#define C1_ALIGNMENT_CONTROL 0x02 -#define C1_DCACHE_CONTROL 0x04 -#define C1_ICACHE_CONTROL 0x1000 -#define C1_VECTOR_CONTROL 0x2000 - -/* GLOBALS ********************************************************************/ - -.global _start -.global ArmTranslationTable -.section startup - -/* BOOT CODE ******************************************************************/ - -_start: + .section startup + NESTED_ENTRY _start + PROLOG_END _start + // // C entrypoint // @@ -67,8 +52,7 @@ // r0 contains the ARM_BOARD_CONFIGURATION_DATA structure // bx lr - -/* BOOT STACK *****************************************************************/ + ENTRY_END _start L_BootStackEnd: .long BootStackEnd @@ -81,9 +65,8 @@ .space 0x4000 BootStackEnd: .long 0 - -/* INITIAL PAGE TABLE *********************************************************/ .section pagedata +.global ArmTranslationTable ArmTranslationTable: .space 0x4000 Added: trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h (added) +++ trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h Tue Feb 12 08:55:12 2008 @@ -1,0 +1,9 @@ +.equ CPSR_IRQ_DISABLE, 0x80 +.equ CPSR_FIQ_DISABLE, 0x40 +.equ CPSR_THUMB_ENABLE, 0x20 + +.equ C1_MMU_CONTROL, 0x01 +.equ C1_ALIGNMENT_CONTROL, 0x02 +.equ C1_DCACHE_CONTROL, 0x04 +.equ C1_ICACHE_CONTROL, 0x1000 +.equ C1_VECTOR_CONTROL, 0x2000 Propchange: trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/ntoskrnl/include/internal/arm/kxarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/kxarm.h (added) +++ trunk/reactos/ntoskrnl/include/internal/arm/kxarm.h Tue Feb 12 08:55:12 2008 @@ -1,0 +1,21 @@ + +.macro TEXTAREA + .section text, "rx" + .align 2 +.endm + +.macro NESTED_ENTRY Name + .global &Name + .align 2 + .func &Name + &Name: +.endm + +.macro PROLOG_END Name + prolog_&Name: +.endm + +.macro ENTRY_END Name + end_&Name: + .endfunc +.endm Propchange: trunk/reactos/ntoskrnl/include/internal/arm/kxarm.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/include/internal/arm/kxarm.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/ntoskrnl/ke/arm/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/boot.s?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/boot.s (added) +++ trunk/reactos/ntoskrnl/ke/arm/boot.s Tue Feb 12 08:55:12 2008 @@ -1,0 +1,22 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ke/arm/boot.s + * PURPOSE: Implements the kernel entry point for ARM machines + * PROGRAMMERS: ReactOS Portable Systems Group + */ + + .title "ARM Kernel Entry Point" + .include "ntoskrnl/include/internal/arm/kxarm.h" + .include "ntoskrnl/include/internal/arm/ksarm.h" + + TEXTAREA + NESTED_ENTRY KiSystemStartup + PROLOG_END KiSystemStartup + + // + // Do stuff! + // + b . + + ENTRY_END KiSystemStartup Propchange: trunk/reactos/ntoskrnl/ke/arm/boot.s ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/ke/arm/boot.s ------------------------------------------------------------------------------ svn:mime-type = text/plain 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 (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s Tue Feb 12 08:55:12 2008 @@ -111,7 +111,6 @@ GENERATE_ARM_STUB KeDisableInterrupts GENERATE_ARM_STUB KeContextToTrapFrame GENERATE_ARM_STUB KiDispatchException -GENERATE_ARM_STUB KiSystemStartup GENERATE_ARM_STUB NtSetLdtEntries GENERATE_ARM_STUB NtRaiseException GENERATE_ARM_STUB NtCallbackReturn Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Tue Feb 12 08:55:12 2008 @@ -59,7 +59,8 @@ </if> <if property="ARCH" value="arm"> <directory name="arm"> - <file>stubs_asm.s</file> + <file first="true">boot.s</file> + <file>stubs_asm.s</file> <file>stubs.c</file> </directory> </if>

1 0

[ros-arm-bringup] 32312: fixed math
by ros-arm-bringup＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: ros-arm-bringup Date: Tue Feb 12 08:07:08 2008 New Revision: 32312 URL: http://svn.reactos.org/svn/reactos?rev=32312&view=rev Log: fixed math Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c Tue Feb 12 08:07:08 2008 @@ -72,7 +72,7 @@ Pte.L1.Section.Ignored = Pte.L1.Section.Ignored1 = 0; // - // Map KSEG0 (0x80000000 - 0xA0000000) to 0x00000000 - 0x80000000 + // Map KSEG0 (0x80000000 - 0xA0000000) to 0x00000000 - 0x20000000 // In this way, the KERNEL_PHYS_ADDR (0x800000) becomes 0x80800000 // which is the entrypoint, just like on x86. //

1 0

[ros-arm-bringup] 32311: Better organize FreeLDR ARM files -- there are no more stubs now. We have the ReactOS kernel loader in loader.c, just like on x86, and the ARM FreeLDR HAL/Mach routines in macharm.c
by ros-arm-bringup＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: ros-arm-bringup Date: Tue Feb 12 07:22:39 2008 New Revision: 32311 URL: http://svn.reactos.org/svn/reactos?rev=32311&view=rev Log: Better organize FreeLDR ARM files -- there are no more stubs now. We have the ReactOS kernel loader in loader.c, just like on x86, and the ARM FreeLDR HAL/Mach routines in macharm.c Added: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c - copied, changed from r32310, trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c Removed: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Copied: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c (from r32310, trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c Tue Feb 12 07:22:39 2008 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Boot Loader * LICENSE: GPL - See COPYING in the top level directory - * FILE: boot/freeldr/arch/arm/stubs.c - * PURPOSE: Non-completed ARM hardware-specific routines + * FILE: boot/freeldr/arch/arm/loader.c + * PURPOSE: ARM Kernel Loader * PROGRAMMERS: ReactOS Portable Systems Group */ @@ -22,31 +22,6 @@ extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; /* FUNCTIONS ******************************************************************/ - -BOOLEAN -ArmDiskGetDriveGeometry(IN ULONG DriveNumber, - OUT PGEOMETRY Geometry) -{ - ASSERT(gRamDiskBase == NULL); - return FALSE; -} - -BOOLEAN -ArmDiskReadLogicalSectors(IN ULONG DriveNumber, - IN ULONGLONG SectorNumber, - IN ULONG SectorCount, - IN PVOID Buffer) -{ - ASSERT(gRamDiskBase == NULL); - return FALSE; -} - -ULONG -ArmDiskGetCacheableBlockCount(IN ULONG DriveNumber) -{ - ASSERT(gRamDiskBase == NULL); - return FALSE; -} VOID ArmSetupPageDirectory(VOID) @@ -182,123 +157,6 @@ // } -PCONFIGURATION_COMPONENT_DATA -ArmHwDetect(VOID) -{ - PCONFIGURATION_COMPONENT_DATA RootNode; - - // - // Create the root node - // - FldrCreateSystemKey(&RootNode); - - // - // Write null component information - // - FldrSetComponentInformation(RootNode, - 0x0, - 0x0, - 0xFFFFFFFF); - - // - // TODO: - // There's no such thing as "PnP" on embedded hardware. - // The boot loader will send us a device tree, similar to ACPI - // or OpenFirmware device trees, and we will convert it to ARC. - // - - // - // Return the root node - // - return RootNode; -} - -ULONG -ArmMemGetMemoryMap(OUT PBIOS_MEMORY_MAP BiosMemoryMap, - IN ULONG MaxMemoryMapSize) -{ - // - // Return whatever the board returned to us (CS0 Base + Size and FLASH0) - // - RtlCopyMemory(BiosMemoryMap, - ArmBoardBlock->MemoryMap, - ArmBoardBlock->MemoryMapEntryCount * sizeof(BIOS_MEMORY_MAP)); - return ArmBoardBlock->MemoryMapEntryCount; -} - -VOID -MachInit(IN PCCH CommandLine) -{ - // - // Setup board-specific ARM routines - // - switch (ArmBoardBlock->BoardType) - { - // - // Check for Feroceon-base boards - // - case MACH_TYPE_FEROCEON: - - // - // These boards use a UART16550. Set us up for 115200 bps - // - ArmFeroSerialInit(115200); - MachVtbl.ConsPutChar = ArmFeroPutChar; - MachVtbl.ConsKbHit = ArmFeroKbHit; - MachVtbl.ConsGetCh = ArmFeroGetCh; - break; - - // - // Check for ARM Versatile PB boards - // - case MACH_TYPE_VERSATILE_PB: - - // - // These boards use a PrimeCell UART (PL011) - // - ArmVersaSerialInit(115200); - MachVtbl.ConsPutChar = ArmVersaPutChar; - MachVtbl.ConsKbHit = ArmVersaKbHit; - MachVtbl.ConsGetCh = ArmVersaGetCh; - break; - - default: - ASSERT(FALSE); - } - - // - // Setup generic ARM routines for all boards - // - MachVtbl.PrepareForReactOS = ArmPrepareForReactOS; - MachVtbl.GetMemoryMap = ArmMemGetMemoryMap; - MachVtbl.HwDetect = ArmHwDetect; - - // - // Setup disk I/O routines, switch to ramdisk ones for non-NAND boot - // - MachVtbl.DiskReadLogicalSectors = ArmDiskReadLogicalSectors; - MachVtbl.DiskGetDriveGeometry = ArmDiskGetDriveGeometry; - MachVtbl.DiskGetCacheableBlockCount = ArmDiskGetCacheableBlockCount; - RamDiskSwitchFromBios(); - - // - // Now set default disk handling routines -- we don't need to override - // - MachVtbl.DiskGetBootVolume = DiskGetBootVolume; - MachVtbl.DiskGetSystemVolume = DiskGetSystemVolume; - MachVtbl.DiskGetBootPath = DiskGetBootPath; - MachVtbl.DiskGetBootDevice = DiskGetBootDevice; - MachVtbl.DiskBootingFromFloppy = DiskBootingFromFloppy; - MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; - MachVtbl.DiskGetPartitionEntry = DiskGetPartitionEntry; - - // - // We can now print to the console - // - TuiPrintf("%s for ARM\n", GetFreeLoaderVersionString()); - TuiPrintf("Bootargs: %s\n", CommandLine); -} - VOID FrLdrStartup(IN ULONG Magic) { Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c Tue Feb 12 07:22:39 2008 @@ -14,6 +14,7 @@ PARM_BOARD_CONFIGURATION_BLOCK ArmBoardBlock; ULONG BootDrive, BootPartition; +VOID ArmPrepareForReactOS(IN BOOLEAN Setup); /* FUNCTIONS ******************************************************************/ @@ -43,3 +44,144 @@ BootMain(ArmBoardBlock->CommandLine); } +BOOLEAN +ArmDiskGetDriveGeometry(IN ULONG DriveNumber, + OUT PGEOMETRY Geometry) +{ + ASSERT(gRamDiskBase == NULL); + return FALSE; +} + +BOOLEAN +ArmDiskReadLogicalSectors(IN ULONG DriveNumber, + IN ULONGLONG SectorNumber, + IN ULONG SectorCount, + IN PVOID Buffer) +{ + ASSERT(gRamDiskBase == NULL); + return FALSE; +} + +ULONG +ArmDiskGetCacheableBlockCount(IN ULONG DriveNumber) +{ + ASSERT(gRamDiskBase == NULL); + return FALSE; +} + +PCONFIGURATION_COMPONENT_DATA +ArmHwDetect(VOID) +{ + PCONFIGURATION_COMPONENT_DATA RootNode; + + // + // Create the root node + // + FldrCreateSystemKey(&RootNode); + + // + // Write null component information + // + FldrSetComponentInformation(RootNode, + 0x0, + 0x0, + 0xFFFFFFFF); + + // + // TODO: + // There's no such thing as "PnP" on embedded hardware. + // The boot loader will send us a device tree, similar to ACPI + // or OpenFirmware device trees, and we will convert it to ARC. + // + + // + // Return the root node + // + return RootNode; +} + +ULONG +ArmMemGetMemoryMap(OUT PBIOS_MEMORY_MAP BiosMemoryMap, + IN ULONG MaxMemoryMapSize) +{ + // + // Return whatever the board returned to us (CS0 Base + Size and FLASH0) + // + RtlCopyMemory(BiosMemoryMap, + ArmBoardBlock->MemoryMap, + ArmBoardBlock->MemoryMapEntryCount * sizeof(BIOS_MEMORY_MAP)); + return ArmBoardBlock->MemoryMapEntryCount; +} + +VOID +MachInit(IN PCCH CommandLine) +{ + // + // Setup board-specific ARM routines + // + switch (ArmBoardBlock->BoardType) + { + // + // Check for Feroceon-base boards + // + case MACH_TYPE_FEROCEON: + + // + // These boards use a UART16550. Set us up for 115200 bps + // + ArmFeroSerialInit(115200); + MachVtbl.ConsPutChar = ArmFeroPutChar; + MachVtbl.ConsKbHit = ArmFeroKbHit; + MachVtbl.ConsGetCh = ArmFeroGetCh; + break; + + // + // Check for ARM Versatile PB boards + // + case MACH_TYPE_VERSATILE_PB: + + // + // These boards use a PrimeCell UART (PL011) + // + ArmVersaSerialInit(115200); + MachVtbl.ConsPutChar = ArmVersaPutChar; + MachVtbl.ConsKbHit = ArmVersaKbHit; + MachVtbl.ConsGetCh = ArmVersaGetCh; + break; + + default: + ASSERT(FALSE); + } + + // + // Setup generic ARM routines for all boards + // + MachVtbl.PrepareForReactOS = ArmPrepareForReactOS; + MachVtbl.GetMemoryMap = ArmMemGetMemoryMap; + MachVtbl.HwDetect = ArmHwDetect; + + // + // Setup disk I/O routines, switch to ramdisk ones for non-NAND boot + // + MachVtbl.DiskReadLogicalSectors = ArmDiskReadLogicalSectors; + MachVtbl.DiskGetDriveGeometry = ArmDiskGetDriveGeometry; + MachVtbl.DiskGetCacheableBlockCount = ArmDiskGetCacheableBlockCount; + RamDiskSwitchFromBios(); + + // + // Now set default disk handling routines -- we don't need to override + // + MachVtbl.DiskGetBootVolume = DiskGetBootVolume; + MachVtbl.DiskGetSystemVolume = DiskGetSystemVolume; + MachVtbl.DiskGetBootPath = DiskGetBootPath; + MachVtbl.DiskGetBootDevice = DiskGetBootDevice; + MachVtbl.DiskBootingFromFloppy = DiskBootingFromFloppy; + MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; + MachVtbl.DiskGetPartitionEntry = DiskGetPartitionEntry; + + // + // We can now print to the console + // + TuiPrintf("%s for ARM\n", GetFreeLoaderVersionString()); + TuiPrintf("Bootargs: %s\n", CommandLine); +} Removed: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c (removed) @@ -1,322 +1,0 @@ -/* - * PROJECT: ReactOS Boot Loader - * LICENSE: GPL - See COPYING in the top level directory - * FILE: boot/freeldr/arch/arm/stubs.c - * PURPOSE: Non-completed ARM hardware-specific routines - * PROGRAMMERS: ReactOS Portable Systems Group - */ - -/* INCLUDES *******************************************************************/ - -#include <freeldr.h> -#include <internal/arm/ke.h> -#include <internal/arm/mm.h> -#include <internal/arm/intrin_i.h> - -/* GLOBALS ********************************************************************/ - -ULONG PageDirectoryStart, PageDirectoryEnd; -LOADER_PARAMETER_BLOCK ArmLoaderBlock; -LOADER_PARAMETER_EXTENSION ArmExtension; -extern ARM_TRANSLATION_TABLE ArmTranslationTable; -extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; - -/* FUNCTIONS ******************************************************************/ - -BOOLEAN -ArmDiskGetDriveGeometry(IN ULONG DriveNumber, - OUT PGEOMETRY Geometry) -{ - ASSERT(gRamDiskBase == NULL); - return FALSE; -} - -BOOLEAN -ArmDiskReadLogicalSectors(IN ULONG DriveNumber, - IN ULONGLONG SectorNumber, - IN ULONG SectorCount, - IN PVOID Buffer) -{ - ASSERT(gRamDiskBase == NULL); - return FALSE; -} - -ULONG -ArmDiskGetCacheableBlockCount(IN ULONG DriveNumber) -{ - ASSERT(gRamDiskBase == NULL); - return FALSE; -} - -VOID -ArmSetupPageDirectory(VOID) -{ - ARM_TTB_REGISTER TtbRegister; - ARM_DOMAIN_REGISTER DomainRegister; - ARM_PTE Pte; - ULONG i; - PARM_TRANSLATION_TABLE TranslationTable; - - // - // Allocate translation table buffer. - // During bootstrap, this will be a simple L1 (Master) Page Table with - // Section entries for KSEG0 and the first MB of RAM. - // - TranslationTable = &ArmTranslationTable; - if (!TranslationTable) return; - - // - // Set it as the TTB - // - TtbRegister.AsUlong = (ULONG)TranslationTable; - ASSERT(TtbRegister.Reserved == 0); - KeArmTranslationTableRegisterSet(TtbRegister); - - // - // Use Domain 0, enforce AP bits (client) - // - DomainRegister.AsUlong = 0; - DomainRegister.Domain0 = ClientDomain; - KeArmDomainRegisterSet(DomainRegister); - - // - // Set Fault PTEs everywhere - // - RtlZeroMemory(TranslationTable, 4096 * sizeof(ARM_PTE)); - - // - // Build the template PTE - // - Pte.L1.Section.Type = SectionPte; - Pte.L1.Section.Buffered = FALSE; - Pte.L1.Section.Cached = FALSE; - Pte.L1.Section.Reserved = 1; // ARM926EJ-S manual recommends setting to 1 - Pte.L1.Section.Domain = Domain0; - Pte.L1.Section.Access = SupervisorAccess; - Pte.L1.Section.BaseAddress = 0; - Pte.L1.Section.Ignored = Pte.L1.Section.Ignored1 = 0; - - // - // Map KSEG0 (0x80000000 - 0xA0000000) to 0x00000000 - 0x80000000 - // In this way, the KERNEL_PHYS_ADDR (0x800000) becomes 0x80800000 - // which is the entrypoint, just like on x86. - // - for (i = (KSEG0_BASE >> TTB_SHIFT); i < ((KSEG0_BASE + 0x20000000) >> TTB_SHIFT); i++) - { - // - // Write PTE and update the base address (next MB) for the next one - // - TranslationTable->Pte[i] = Pte; - Pte.L1.Section.BaseAddress++; - } - - // - // Identity map the first MB of memory as well - // - Pte.L1.Section.BaseAddress = 0; - TranslationTable->Pte[0] = Pte; -} - -VOID -ArmSetupPagingAndJump(IN ULONG Magic) -{ - ARM_CONTROL_REGISTER ControlRegister; - - // - // Enable MMU, DCache and ICache - // - ControlRegister = KeArmControlRegisterGet(); - ControlRegister.MmuEnabled = TRUE; - ControlRegister.ICacheEnabled = TRUE; - ControlRegister.DCacheEnabled = TRUE; - KeArmControlRegisterSet(ControlRegister); - - // - // Jump to Kernel - // - (*KernelEntryPoint)(Magic, (PVOID)&ArmLoaderBlock); -} - -VOID -ArmPrepareForReactOS(IN BOOLEAN Setup) -{ - // - // Initialize the loader block - // - InitializeListHead(&ArmLoaderBlock.BootDriverListHead); - InitializeListHead(&ArmLoaderBlock.LoadOrderListHead); - InitializeListHead(&ArmLoaderBlock.MemoryDescriptorListHead); - - // - // Setup the extension and setup block - // - ArmLoaderBlock.Extension = &ArmExtension; - ArmLoaderBlock.SetupLdrBlock = NULL; - - // - // TODO: Setup memory descriptors - // - - // - // TODO: Setup registry data - // - - // - // TODO: Setup ARC Hardware tree data - // - - // - // TODO: Setup NLS data - // - - // - // TODO: Setup boot-driver data - // - - // - // TODO: Setup extension parameters - // - - // - // TODO: Setup ARM-specific block - // -} - -PCONFIGURATION_COMPONENT_DATA -ArmHwDetect(VOID) -{ - PCONFIGURATION_COMPONENT_DATA RootNode; - - // - // Create the root node - // - FldrCreateSystemKey(&RootNode); - - // - // Write null component information - // - FldrSetComponentInformation(RootNode, - 0x0, - 0x0, - 0xFFFFFFFF); - - // - // TODO: - // There's no such thing as "PnP" on embedded hardware. - // The boot loader will send us a device tree, similar to ACPI - // or OpenFirmware device trees, and we will convert it to ARC. - // - - // - // Return the root node - // - return RootNode; -} - -ULONG -ArmMemGetMemoryMap(OUT PBIOS_MEMORY_MAP BiosMemoryMap, - IN ULONG MaxMemoryMapSize) -{ - // - // Return whatever the board returned to us (CS0 Base + Size and FLASH0) - // - RtlCopyMemory(BiosMemoryMap, - ArmBoardBlock->MemoryMap, - ArmBoardBlock->MemoryMapEntryCount * sizeof(BIOS_MEMORY_MAP)); - return ArmBoardBlock->MemoryMapEntryCount; -} - -VOID -MachInit(IN PCCH CommandLine) -{ - // - // Setup board-specific ARM routines - // - switch (ArmBoardBlock->BoardType) - { - // - // Check for Feroceon-base boards - // - case MACH_TYPE_FEROCEON: - - // - // These boards use a UART16550. Set us up for 115200 bps - // - ArmFeroSerialInit(115200); - MachVtbl.ConsPutChar = ArmFeroPutChar; - MachVtbl.ConsKbHit = ArmFeroKbHit; - MachVtbl.ConsGetCh = ArmFeroGetCh; - break; - - // - // Check for ARM Versatile PB boards - // - case MACH_TYPE_VERSATILE_PB: - - // - // These boards use a PrimeCell UART (PL011) - // - ArmVersaSerialInit(115200); - MachVtbl.ConsPutChar = ArmVersaPutChar; - MachVtbl.ConsKbHit = ArmVersaKbHit; - MachVtbl.ConsGetCh = ArmVersaGetCh; - break; - - default: - ASSERT(FALSE); - } - - // - // Setup generic ARM routines for all boards - // - MachVtbl.PrepareForReactOS = ArmPrepareForReactOS; - MachVtbl.GetMemoryMap = ArmMemGetMemoryMap; - MachVtbl.HwDetect = ArmHwDetect; - - // - // Setup disk I/O routines, switch to ramdisk ones for non-NAND boot - // - MachVtbl.DiskReadLogicalSectors = ArmDiskReadLogicalSectors; - MachVtbl.DiskGetDriveGeometry = ArmDiskGetDriveGeometry; - MachVtbl.DiskGetCacheableBlockCount = ArmDiskGetCacheableBlockCount; - RamDiskSwitchFromBios(); - - // - // Now set default disk handling routines -- we don't need to override - // - MachVtbl.DiskGetBootVolume = DiskGetBootVolume; - MachVtbl.DiskGetSystemVolume = DiskGetSystemVolume; - MachVtbl.DiskGetBootPath = DiskGetBootPath; - MachVtbl.DiskGetBootDevice = DiskGetBootDevice; - MachVtbl.DiskBootingFromFloppy = DiskBootingFromFloppy; - MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; - MachVtbl.DiskGetPartitionEntry = DiskGetPartitionEntry; - - // - // We can now print to the console - // - TuiPrintf("%s for ARM\n", GetFreeLoaderVersionString()); - TuiPrintf("Bootargs: %s\n", CommandLine); -} - -VOID -FrLdrStartup(IN ULONG Magic) -{ - // - // Disable interrupts (aleady done) - // - - // - // Set proper CPSR (already done) - // - - // - // Initialize the page directory - // - ArmSetupPageDirectory(); - - // - // Initialize paging and load NTOSKRNL - // - ArmSetupPagingAndJump(Magic); -} Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Tue Feb 12 07:22:39 2008 @@ -102,9 +102,9 @@ <define name="_NTHAL_" /> <file>boot.s</file> <file>ferouart.c</file> + <file>loader.c</file> + <file>macharm.c</file> <file>versuart.c</file> - <file>macharm.c</file> - <file>stubs.c</file> </module> </if> </directory>

1 0

[ros-arm-bringup] 32310: We now have the ARM defines/structures in stubs.c in FreeLDR in more appropriate kernel headers. This is just cleanup work.
by ros-arm-bringup＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: ros-arm-bringup Date: Tue Feb 12 07:15:53 2008 New Revision: 32310 URL: http://svn.reactos.org/svn/reactos?rev=32310&view=rev Log: We now have the ARM defines/structures in stubs.c in FreeLDR in more appropriate kernel headers. This is just cleanup work. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h trunk/reactos/ntoskrnl/include/internal/arm/ke.h trunk/reactos/ntoskrnl/include/internal/arm/mm.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c Tue Feb 12 07:15:53 2008 @@ -9,183 +9,11 @@ /* INCLUDES *******************************************************************/ #include <freeldr.h> +#include <internal/arm/ke.h> +#include <internal/arm/mm.h> +#include <internal/arm/intrin_i.h> /* GLOBALS ********************************************************************/ - -typedef union _ARM_PTE -{ - union - { - struct - { - ULONG Type:2; - ULONG Unused:30; - } Fault; - struct - { - ULONG Type:2; - ULONG Reserved:3; - ULONG Domain:4; - ULONG Ignored:1; - ULONG BaseAddress:22; - } Coarse; - struct - { - ULONG Type:2; - ULONG Buffered:1; - ULONG Cached:1; - ULONG Reserved:1; - ULONG Domain:4; - ULONG Ignored:1; - ULONG Access:2; - ULONG Ignored1:8; - ULONG BaseAddress:12; - } Section; - struct - { - ULONG Type:2; - ULONG Reserved:3; - ULONG Domain:4; - ULONG Ignored:3; - ULONG BaseAddress:20; - } Fine; - } L1; - union - { - struct - { - ULONG Type:2; - ULONG Unused:30; - } Fault; - struct - { - ULONG Type:2; - ULONG Buffered:1; - ULONG Cached:1; - ULONG Access0:2; - ULONG Access1:2; - ULONG Access2:2; - ULONG Access3:2; - ULONG Ignored:4; - ULONG BaseAddress:16; - } Large; - struct - { - ULONG Type:2; - ULONG Buffered:1; - ULONG Cached:1; - ULONG Access0:2; - ULONG Access1:2; - ULONG Access2:2; - ULONG Access3:2; - ULONG BaseAddress:20; - } Small; - struct - { - ULONG Type:2; - ULONG Buffered:1; - ULONG Cached:1; - ULONG Access0:2; - ULONG Ignored:4; - ULONG BaseAddress:22; - } Tiny; - } L2; - ULONG AsUlong; -} ARM_PTE, *PARM_PTE; - -typedef struct _ARM_TRANSLATION_TABLE -{ - ARM_PTE Pte[4096]; -} ARM_TRANSLATION_TABLE, *PARM_TRANSLATION_TABLE; - -typedef union _ARM_TTB_REGISTER -{ - struct - { - ULONG Reserved:14; - ULONG BaseAddress:18; - }; - ULONG AsUlong; -} ARM_TTB_REGISTER; - -typedef enum _ARM_L1_PTE_TYPE -{ - FaultPte, - CoarsePte, - SectionPte, - FinePte -} ARM_L1_PTE_TYPE; - -typedef enum _ARM_PTE_ACCESS -{ - FaultAccess, - SupervisorAccess, - SharedAccess, - UserAccess -} ARM_PTE_ACCESS; - -typedef enum _ARM_DOMAIN -{ - FaultDomain, - ClientDomain, - InvalidDomain, - ManagerDomain -} ARM_DOMAIN; - -typedef union _ARM_DOMAIN_REGISTER -{ - struct - { - ULONG Domain0:2; - ULONG Domain1:2; - ULONG Domain2:2; - ULONG Domain3:2; - ULONG Domain4:2; - ULONG Domain5:2; - ULONG Domain6:2; - ULONG Domain7:2; - ULONG Domain8:2; - ULONG Domain9:2; - ULONG Domain10:2; - ULONG Domain11:2; - ULONG Domain12:2; - ULONG Domain13:2; - ULONG Domain14:2; - ULONG Domain15:2; - }; - ULONG AsUlong; -} ARM_DOMAIN_REGISTER; - -typedef union _ARM_CONTROL_REGISTER -{ - struct - { - ULONG MmuEnabled:1; - ULONG AlignmentFaultsEnabled:1; - ULONG DCacheEnabled:1; - ULONG Sbo:3; - ULONG BigEndianEnabled:1; - ULONG System:1; - ULONG Rom:1; - ULONG Sbz:2; - ULONG ICacheEnabled:1; - ULONG HighVectors:1; - ULONG RoundRobinReplacementEnabled:1; - ULONG Armv4Compat:1; - ULONG Sbo1:1; - ULONG Sbz1:1; - ULONG Sbo2:1; - ULONG Reserved:14; - }; - ULONG AsUlong; -} ARM_CONTROL_REGISTER, *PARM_CONTROL_REGISTER; - -typedef enum _ARM_DOMAINS -{ - Domain0 -} ARM_DOMAINS; - -#define TTB_SHIFT 20 ULONG PageDirectoryStart, PageDirectoryEnd; LOADER_PARAMETER_BLOCK ArmLoaderBlock; @@ -218,36 +46,6 @@ { ASSERT(gRamDiskBase == NULL); return FALSE; -} - -ARM_CONTROL_REGISTER -FORCEINLINE -ArmControlRegisterGet(VOID) -{ - ARM_CONTROL_REGISTER Value; - __asm__ __volatile__ ("mrc p15, 0, %0, c1, c0, 0" : "=r"(Value.AsUlong) : : "cc"); - return Value; -} - -VOID -FORCEINLINE -ArmControlRegisterSet(IN ARM_CONTROL_REGISTER ControlRegister) -{ - __asm__ __volatile__ ("mcr p15, 0, %0, c1, c0, 0" : : "r"(ControlRegister.AsUlong) : "cc"); -} - -VOID -FORCEINLINE -ArmMmuTtbSet(IN ARM_TTB_REGISTER Ttb) -{ - __asm__ __volatile__ ("mcr p15, 0, %0, c2, c0, 0" : : "r"(Ttb.AsUlong) : "cc"); -} - -VOID -FORCEINLINE -ArmMmuDomainRegisterSet(IN ARM_DOMAIN_REGISTER DomainRegister) -{ - __asm__ __volatile__ ("mcr p15, 0, %0, c3, c0, 0" : : "r"(DomainRegister.AsUlong) : "cc"); } VOID @@ -272,14 +70,14 @@ // TtbRegister.AsUlong = (ULONG)TranslationTable; ASSERT(TtbRegister.Reserved == 0); - ArmMmuTtbSet(TtbRegister); + KeArmTranslationTableRegisterSet(TtbRegister); // // Use Domain 0, enforce AP bits (client) // DomainRegister.AsUlong = 0; DomainRegister.Domain0 = ClientDomain; - ArmMmuDomainRegisterSet(DomainRegister); + KeArmDomainRegisterSet(DomainRegister); // // Set Fault PTEs everywhere @@ -327,11 +125,11 @@ // // Enable MMU, DCache and ICache // - ControlRegister = ArmControlRegisterGet(); + ControlRegister = KeArmControlRegisterGet(); ControlRegister.MmuEnabled = TRUE; ControlRegister.ICacheEnabled = TRUE; ControlRegister.DCacheEnabled = TRUE; - ArmControlRegisterSet(ControlRegister); + KeArmControlRegisterSet(ControlRegister); // // Jump to Kernel Modified: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h Tue Feb 12 07:15:53 2008 @@ -1,18 +1,45 @@ #ifndef _INTRIN_INTERNAL_ #define _INTRIN_INTERNAL_ -static __inline__ __attribute__((always_inline)) void KeArchHaltProcessor(void) +FORCEINLINE +VOID +KeArmHaltProcessor(void) { // // Enter Wait-For-Interrupt Mode // - __asm__ __volatile__ - ( - "mov r1, #0;" - "mcr p15, 0, r1, c7, c0, 4;" - ); + __asm__ __volatile__ ("mcr p15, 0, %0, c7, c0, 4" : : "r"(0) : "cc"); } +FORCEINLINE +ARM_CONTROL_REGISTER +KeArmControlRegisterGet(VOID) +{ + ARM_CONTROL_REGISTER Value; + __asm__ __volatile__ ("mrc p15, 0, %0, c1, c0, 0" : "=r"(Value.AsUlong) : : "cc"); + return Value; +} + +FORCEINLINE +VOID +KeArmControlRegisterSet(IN ARM_CONTROL_REGISTER ControlRegister) +{ + __asm__ __volatile__ ("mcr p15, 0, %0, c1, c0, 0" : : "r"(ControlRegister.AsUlong) : "cc"); +} + +FORCEINLINE +VOID +KeArmTranslationTableRegisterSet(IN ARM_TTB_REGISTER Ttb) +{ + __asm__ __volatile__ ("mcr p15, 0, %0, c2, c0, 0" : : "r"(Ttb.AsUlong) : "cc"); +} + +FORCEINLINE +VOID +KeArmDomainRegisterSet(IN ARM_DOMAIN_REGISTER DomainRegister) +{ + __asm__ __volatile__ ("mcr p15, 0, %0, c3, c0, 0" : : "r"(DomainRegister.AsUlong) : "cc"); +} + +#define KeArchHaltProcessor KeArmHaltProcessor #endif - -/* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h Tue Feb 12 07:15:53 2008 @@ -4,6 +4,84 @@ #if __GNUC__ >=3 #pragma GCC system_header #endif + +typedef union _ARM_TTB_REGISTER +{ + struct + { + ULONG Reserved:14; + ULONG BaseAddress:18; + }; + ULONG AsUlong; +} ARM_TTB_REGISTER; + +typedef union _ARM_DOMAIN_REGISTER +{ + struct + { + ULONG Domain0:2; + ULONG Domain1:2; + ULONG Domain2:2; + ULONG Domain3:2; + ULONG Domain4:2; + ULONG Domain5:2; + ULONG Domain6:2; + ULONG Domain7:2; + ULONG Domain8:2; + ULONG Domain9:2; + ULONG Domain10:2; + ULONG Domain11:2; + ULONG Domain12:2; + ULONG Domain13:2; + ULONG Domain14:2; + ULONG Domain15:2; + }; + ULONG AsUlong; +} ARM_DOMAIN_REGISTER; + +typedef union _ARM_CONTROL_REGISTER +{ + struct + { + ULONG MmuEnabled:1; + ULONG AlignmentFaultsEnabled:1; + ULONG DCacheEnabled:1; + ULONG Sbo:3; + ULONG BigEndianEnabled:1; + ULONG System:1; + ULONG Rom:1; + ULONG Sbz:2; + ULONG ICacheEnabled:1; + ULONG HighVectors:1; + ULONG RoundRobinReplacementEnabled:1; + ULONG Armv4Compat:1; + ULONG Sbo1:1; + ULONG Sbz1:1; + ULONG Sbo2:1; + ULONG Reserved:14; + }; + ULONG AsUlong; +} ARM_CONTROL_REGISTER, *PARM_CONTROL_REGISTER; + +typedef enum _ARM_DOMAINS +{ + Domain0, + Domain1, + Domain2, + Domain3, + Domain4, + Domain5, + Domain6, + Domain7, + Domain8, + Domain9, + Domain10, + Domain11, + Domain12, + Domain13, + Domain14, + Domain15 +} ARM_DOMAINS; VOID NTAPI @@ -17,4 +95,4 @@ #define KeArchInitThreadWithContext KeArmInitThreadWithContext -#endif +#endif Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/mm.h Tue Feb 12 07:15:53 2008 @@ -1,1 +1,120 @@ +#ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARM_MM_H +#define __NTOSKRNL_INCLUDE_INTERNAL_ARM_MM_H +#if __GNUC__ >=3 +#pragma GCC system_header +#endif + +#define TTB_SHIFT 20 + +typedef union _ARM_PTE +{ + union + { + struct + { + ULONG Type:2; + ULONG Unused:30; + } Fault; + struct + { + ULONG Type:2; + ULONG Reserved:3; + ULONG Domain:4; + ULONG Ignored:1; + ULONG BaseAddress:22; + } Coarse; + struct + { + ULONG Type:2; + ULONG Buffered:1; + ULONG Cached:1; + ULONG Reserved:1; + ULONG Domain:4; + ULONG Ignored:1; + ULONG Access:2; + ULONG Ignored1:8; + ULONG BaseAddress:12; + } Section; + struct + { + ULONG Type:2; + ULONG Reserved:3; + ULONG Domain:4; + ULONG Ignored:3; + ULONG BaseAddress:20; + } Fine; + } L1; + union + { + struct + { + ULONG Type:2; + ULONG Unused:30; + } Fault; + struct + { + ULONG Type:2; + ULONG Buffered:1; + ULONG Cached:1; + ULONG Access0:2; + ULONG Access1:2; + ULONG Access2:2; + ULONG Access3:2; + ULONG Ignored:4; + ULONG BaseAddress:16; + } Large; + struct + { + ULONG Type:2; + ULONG Buffered:1; + ULONG Cached:1; + ULONG Access0:2; + ULONG Access1:2; + ULONG Access2:2; + ULONG Access3:2; + ULONG BaseAddress:20; + } Small; + struct + { + ULONG Type:2; + ULONG Buffered:1; + ULONG Cached:1; + ULONG Access0:2; + ULONG Ignored:4; + ULONG BaseAddress:22; + } Tiny; + } L2; + ULONG AsUlong; +} ARM_PTE, *PARM_PTE; + +typedef struct _ARM_TRANSLATION_TABLE +{ + ARM_PTE Pte[4096]; +} ARM_TRANSLATION_TABLE, *PARM_TRANSLATION_TABLE; + +typedef enum _ARM_L1_PTE_TYPE +{ + FaultPte, + CoarsePte, + SectionPte, + FinePte +} ARM_L1_PTE_TYPE; + +typedef enum _ARM_PTE_ACCESS +{ + FaultAccess, + SupervisorAccess, + SharedAccess, + UserAccess +} ARM_PTE_ACCESS; + +typedef enum _ARM_DOMAIN +{ + FaultDomain, + ClientDomain, + InvalidDomain, + ManagerDomain +} ARM_DOMAIN; + +#endif Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Tue Feb 12 07:15:53 2008 @@ -22,7 +22,6 @@ #undef PsGetCurrentProcess #define PsGetCurrentProcess _PsGetCurrentProcess -#include "arch/intrin_i.h" #include "ke.h" #include "i386/mm.h" #include "i386/fpu.h" @@ -54,6 +53,7 @@ #include "inbv.h" #include "vdm.h" #include "hal.h" +#include "arch/intrin_i.h" // // We are very lazy on ARM -- we just import intrinsics

1 0

[ros-arm-bringup] 32309: Fix the build. Your friendly ARM ninjas apologize.
by ros-arm-bringup＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: ros-arm-bringup Date: Tue Feb 12 06:06:06 2008 New Revision: 32309 URL: http://svn.reactos.org/svn/reactos?rev=32309&view=rev Log: Fix the build. Your friendly ARM ninjas apologize. Modified: trunk/reactos/include/ddk/ntstrsafe.h trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/include/ddk/ntstrsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntstrsafe.h?re… ============================================================================== --- trunk/reactos/include/ddk/ntstrsafe.h (original) +++ trunk/reactos/include/ddk/ntstrsafe.h Tue Feb 12 06:06:06 2008 @@ -203,7 +203,6 @@ /* PUBLIC FUNCTIONS **********************************************************/ -FORCEINLINE NTSTATUS NTAPI RtlStringCbPrintfA(OUT PCHAR Destination, @@ -233,7 +232,6 @@ return Status; } -FORCEINLINE NTSTATUS NTAPI RtlStringCbPrintfExA(OUT PCHAR Destination, Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Tue Feb 12 06:06:06 2008 @@ -13,7 +13,6 @@ #include <debug.h> /* GCC's incompetence strikes again */ -FORCEINLINE VOID sprintf_nt(IN PCHAR Buffer, IN PCHAR Format,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs