Index: branches/mozodojo/i386/libsaio/acpi_patcher.c =================================================================== --- branches/mozodojo/i386/libsaio/acpi_patcher.c (revision 217) +++ branches/mozodojo/i386/libsaio/acpi_patcher.c (revision 218) @@ -189,17 +189,20 @@ uint8_t acpi_cpu_count = 0; char* acpi_cpu_name[32]; -void get_acpi_cpu_names(unsigned char* dsdt, int length) +void get_acpi_cpu_names(unsigned char* dsdt, unsigned int length) { - int i; + unsigned int i; for (i=0; i> 6), j; + unsigned int offset = i + 3 + (dsdt[i+2] >> 6); + bool add_name = TRUE; + char j; + for (j=0; j<4; j++) { char c = dsdt[offset+j]; @@ -207,7 +210,7 @@ if (!aml_isvalidchar(c)) { add_name = FALSE; - verbose("Invalid characters found in ProcessorOP 0x%x!\n", c); + verbose("Invalid character found in ProcessorOP 0x%x!\n", c); break; } } @@ -218,7 +221,7 @@ memcpy(acpi_cpu_name[acpi_cpu_count], dsdt+offset, 4); i = offset + 5; - verbose("Found %c%c%c%c (from DSDT)\n", acpi_cpu_name[acpi_cpu_count][0], acpi_cpu_name[acpi_cpu_count][1], acpi_cpu_name[acpi_cpu_count][2], acpi_cpu_name[acpi_cpu_count][3]); + verbose("Found ACPI CPU: %c%c%c%c\n", acpi_cpu_name[acpi_cpu_count][0], acpi_cpu_name[acpi_cpu_count][1], acpi_cpu_name[acpi_cpu_count][2], acpi_cpu_name[acpi_cpu_count][3]); if (++acpi_cpu_count == 32) return; } @@ -356,7 +359,7 @@ } else { - verbose ("DSDT CPUs not found: C-States not generated !!!\n"); + verbose ("ACPI CPUs not found: C-States not generated !!!\n"); } return NULL; @@ -569,7 +572,7 @@ } } else { - verbose ("DSDT CPUs not found: P-States not generated !!!\n"); + verbose ("ACPI CPUs not found: P-States not generated !!!\n"); } return NULL;