[ACPI_NEW] Update

drivers/bus/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 if(NOT ARCH STREQUAL "arm")
-add_subdirectory(acpi)
+#add_subdirectory(acpi)
 endif()
 add_subdirectory(acpi_new)
 add_subdirectory(isapnp)

drivers/bus/acpi_new/CMakeLists.txt

@@ -19,21 +19,23 @@ list(APPEND UACPI_SOURCE
     source/sleep.c
     source/registers.c
     source/resources.c
-    source/event.c)
+    source/event.c
+    source/mutex.c
+    source/osi.c)
 
 add_library(uacpi ${UACPI_SOURCE})
 #add_pch(uacpi include/uacpi/acpi.h SOURCE) idk
 
 list(APPEND ACPI_SOURCE
     main.c)
 
-add_library(acpi_new MODULE
+add_library(acpi MODULE
     ${ACPI_SOURCE}
     acpi.rc)
 
-set_module_type(acpi_new kernelmodedriver)
-target_link_libraries(acpi_new uacpi)
-add_importlibs(acpi_new ntoskrnl hal)
-#add_pch(acpi_new precomp.h ACPI_SOURCE)
-add_cd_file(TARGET acpi_new DESTINATION reactos/system32/drivers NO_CAB FOR all)
-add_driver_inf(acpi_new acpi.inf)
+set_module_type(acpi kernelmodedriver)
+target_link_libraries(acpi uacpi)
+add_importlibs(acpi ntoskrnl hal)
+#add_pch(acpi precomp.h ACPI_SOURCE)
+add_cd_file(TARGET acpi DESTINATION reactos/system32/drivers NO_CAB FOR all)
+add_driver_inf(acpi acpi.inf)

drivers/bus/acpi_new/acpi.inf

@@ -0,0 +1,130 @@
+; ACPI.INF
+
+; Installation file for ACPI driver
+
+[Version]
+Signature  = "$Windows NT$"
+;Signature  = "$ReactOS$"
+LayoutFile = layout.inf
+Class      = System
+ClassGUID  = {4D36E97D-E325-11CE-BFC1-08002BE10318}
+Provider   = %ReactOS%
+DriverVer  = 10/11/2005,1.01.0.0
+
+[DestinationDirs]
+DefaultDestDir = 12
+
+[Manufacturer]
+%GenericMfg% = GenericMfg
+
+[GenericMfg]
+%*PNP0C08.DeviceDesc% = ACPI_Inst,*PNP0C08
+%COMPOSITE_BATTERY.DeviceDesc% = CompBatt_Inst,COMPOSITE_BATTERY
+
+;------------------------------ ACPI DRIVER -----------------------------
+
+[ACPI_Inst.NT]
+CopyFiles = ACPI_CopyFiles.NT
+
+[ACPI_CopyFiles.NT]
+acpi.sys
+
+[ACPI_Inst.NT.Services]
+AddService = acpi, 0x00000002, acpi_Service_Inst
+
+[acpi_Service_Inst]
+ServiceType   = 1
+StartType     = 0
+ErrorControl  = 1
+ServiceBinary = %12%\acpi.sys
+LoadOrderGroup = Boot Bus Extender
+
+;---------------------------- COMPBATT DRIVER ---------------------------
+
+[CompBatt_Inst.NT]
+CopyFiles = CompBatt_CopyFiles.NT
+
+[CompBatt_CopyFiles.NT]
+compbatt.sys
+
+[CompBatt_Inst.NT.Services]
+AddService = compbatt, 0x00000002, compbatt_Service_Inst
+
+[compbatt_Service_Inst]
+ServiceType   = 1
+StartType     = 0
+ErrorControl  = 1
+ServiceBinary = %12%\compbatt.sys
+LoadOrderGroup = System Bus Extender
+
+;-------------------------------- STRINGS -------------------------------
+
+[Strings]
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
+GenericMfg = "(Generic system devices)"
+*PNP0C08.DeviceDesc = "ACPI hardware"
+COMPOSITE_BATTERY.DeviceDesc = "Composite battery"
+
+[Strings.0405]
+GenericMfg = "(Generická systémová zařízení)"
+
+[Strings.0404]
+GenericMfg = "（標準系統裝置）"
+*PNP0C08.DeviceDesc = "ACPI 硬體"
+
+[Strings.0407]
+GenericMfg = "(Generische Systemgeräte)"
+*PNP0C08.DeviceDesc = "ACPI Hardware"
+
+[Strings.0a]
+GenericMfg = "(Dispositivos del sistema estándar)"
+*PNP0C08.DeviceDesc = "Hardware ACPI"
+
+[Strings.040C]
+GenericMfg = "(Périphériques systèmes génériques)"
+
+[Strings.0411]
+GenericMfg = "(標準システム デバイス)"
+*PNP0C08.DeviceDesc = "ACPI ハードウェア"
+
+[Strings.0415]
+GenericMfg = "(Standardowe urządzenia systemowe)"
+*PNP0C08.DeviceDesc = "Sprzęt ACPI"
+
+[Strings.0416]
+GenericMfg = "(Dispositivos de sistema padrão)"
+*PNP0C08.DeviceDesc = "Hardware ACPI"
+
+[Strings.0418]
+GenericMfg = "(dispozitiv de sistem generic)"
+*PNP0C08.DeviceDesc = "Dispozitive ACPI"
+
+[Strings.0419]
+GenericMfg = "(Стандартные системные устройства)"
+*PNP0C08.DeviceDesc = "Устройства ACPI"
+
+[Strings.041B]
+GenericMfg = "(Generické systémové zariadenia)"
+*PNP0C08.DeviceDesc = "ACPI hardvér"
+
+[Strings.041f]
+GenericMfg = "(Genel Sistem Aygıtları)"
+*PNP0C08.DeviceDesc = "ACPI Donanım"
+
+[Strings.0422]
+GenericMfg = "(Стандартні системні пристрої)"
+*PNP0C08.DeviceDesc = "Пристрої ACPI"
+
+[Strings.0427]
+GenericMfg = "(Standartiniai sisteminiai įrenginiai)"
+
+[Strings.0804]
+GenericMfg = "（通用系统设备）"
+*PNP0C08.DeviceDesc = "ACPI 硬件"
+
+[Strings.0c04]
+GenericMfg = "（標準系統裝置）"
+*PNP0C08.DeviceDesc = "ACPI 硬件"

drivers/bus/acpi_new/acpi.rc

@@ -1,5 +1,5 @@
 #define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS ACPI NEW Driver"
-#define REACTOS_STR_INTERNAL_NAME     "acpi_new"
-#define REACTOS_STR_ORIGINAL_FILENAME "acpi_new.sys"
+#define REACTOS_STR_FILE_DESCRIPTION  "uACPI ReactOS ACPI Driver"
+#define REACTOS_STR_INTERNAL_NAME     "acpi"
+#define REACTOS_STR_ORIGINAL_FILENAME "acpi.sys"
 #include <reactos/version.rc>