ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-26 19:33:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMBATT] Remove useless fields in device extension

Browse Source 
Information is already present in BifData, and those fields were never filled.
This commit is contained in:
Hervé Poussineau
2024-08-12 11:56:18 +02:00
parent 359e73d055
commit 2ff683fa33
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/bus/acpi/cmbatt/cmbatt.c
+6 -6
View File
@@ -1120,7 +1120,7 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension,
case BatteryDeviceName:
/* Build the model number string */
RtlInitAnsiString(&TempString, FdoExtension->ModelNumber);
RtlInitAnsiString(&TempString, FdoExtension->BifData.ModelNumber);
/* Convert it to Unicode */
InfoString.Buffer = InfoBuffer;
@@ -1142,7 +1142,7 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension,
case BatteryManufactureName:
/* Build the OEM info string */
RtlInitAnsiString(&TempString, FdoExtension->OemInfo);
RtlInitAnsiString(&TempString, FdoExtension->BifData.OemInfo);
/* Convert it to Unicode */
InfoString.Buffer = InfoBuffer;
@@ -1157,7 +1157,7 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension,
case BatteryUniqueID:
/* Build the serial number string */
RtlInitAnsiString(&TempString, FdoExtension->SerialNumber);
RtlInitAnsiString(&TempString, FdoExtension->BifData.SerialNumber);
/* Convert it to Unicode */
InfoString.Buffer = InfoBuffer;
@@ -1169,10 +1169,10 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension,
TempString2.MaximumLength = sizeof(TempBuffer);
/* Check if there's an OEM string */
if (FdoExtension->OemInfo[0])
if (FdoExtension->BifData.OemInfo[0])
{
/* Build the OEM info string */
RtlInitAnsiString(&TempString, FdoExtension->OemInfo);
RtlInitAnsiString(&TempString, FdoExtension->BifData.OemInfo);
/* Convert it to Unicode and append it */
RtlAnsiStringToUnicodeString(&TempString2, &TempString, 0);
@@ -1180,7 +1180,7 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension,
}
/* Build the model number string */
RtlInitAnsiString(&TempString, FdoExtension->ModelNumber);
RtlInitAnsiString(&TempString, FdoExtension->BifData.ModelNumber);
/* Convert it to Unicode and append it */
RtlAnsiStringToUnicodeString(&TempString2, &TempString, 0);
drivers/bus/acpi/cmbatt/cmbatt.h
-6
View File
@@ -124,12 +124,6 @@ typedef struct _CMBATT_DEVICE_EXTENSION
LONG ArLockValue;
ULONG TagData;
ULONG Tag;
ULONG ModelNumberLength;
PCHAR ModelNumber;
ULONG SerialNumberLength;
PCHAR SerialNumber;
ULONG OemInfoLength;
PCHAR OemInfo;
ACPI_BST_DATA BstData;
ACPI_BIF_DATA BifData;
ULONG Id;