Change some formats and add some casts to make this
WARNS=2 clean, and mark it as such. PR: 71672 (partly) Reviewed by: njl
This commit is contained in:
parent
118fd13167
commit
e18d08c9b0
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=137636
@ -35,6 +35,7 @@ SRCS+= dbcmds.c dbdisply.c dbexec.c dbfileio.c \
|
|||||||
utmisc.c utobject.c utxface.c
|
utmisc.c utobject.c utxface.c
|
||||||
|
|
||||||
MAN= acpidb.8
|
MAN= acpidb.8
|
||||||
|
WARNS?= 2
|
||||||
|
|
||||||
CFLAGS+= -DACPI_APPLICATION -DACPI_DEBUG_OUTPUT -DACPI_DEBUGGER \
|
CFLAGS+= -DACPI_APPLICATION -DACPI_DEBUG_OUTPUT -DACPI_DEBUGGER \
|
||||||
-DACPI_DISASSEMBLER
|
-DACPI_DISASSEMBLER
|
||||||
|
@ -159,8 +159,8 @@ aml_simulate_prompt(char *msg, ACPI_INTEGER def_val)
|
|||||||
if (msg != NULL) {
|
if (msg != NULL) {
|
||||||
printf("%s", msg);
|
printf("%s", msg);
|
||||||
}
|
}
|
||||||
printf("(default: 0x%x ", val);
|
printf("(default: 0x%x ", (uint32_t)val);
|
||||||
printf(" / %u) >>", val);
|
printf(" / %u) >>", (uint32_t)val);
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
|
|
||||||
bzero(buf, sizeof buf);
|
bzero(buf, sizeof buf);
|
||||||
@ -238,7 +238,7 @@ aml_simulation_regdump(const char *dumpfile)
|
|||||||
}
|
}
|
||||||
while (!TAILQ_EMPTY(&RegionContentList)) {
|
while (!TAILQ_EMPTY(&RegionContentList)) {
|
||||||
rc = TAILQ_FIRST(&RegionContentList);
|
rc = TAILQ_FIRST(&RegionContentList);
|
||||||
fprintf(fp, "%d 0x%x 0x%x\n",
|
fprintf(fp, "%d 0x%jx 0x%x\n",
|
||||||
rc->regtype, rc->addr, rc->value);
|
rc->regtype, rc->addr, rc->value);
|
||||||
TAILQ_REMOVE(&RegionContentList, rc, links);
|
TAILQ_REMOVE(&RegionContentList, rc, links);
|
||||||
free(rc);
|
free(rc);
|
||||||
@ -261,11 +261,11 @@ aml_vm_space_handler(
|
|||||||
ACPI_INTEGER *Value,
|
ACPI_INTEGER *Value,
|
||||||
int Prompt)
|
int Prompt)
|
||||||
{
|
{
|
||||||
int state;
|
int state;
|
||||||
UINT8 val;
|
UINT8 val;
|
||||||
ACPI_INTEGER value, i;
|
ACPI_INTEGER value, i;
|
||||||
char msg[256];
|
char msg[256];
|
||||||
static char *space_names[] = {
|
static const char *space_names[] = {
|
||||||
"SYSTEM_MEMORY", "SYSTEM_IO", "PCI_CONFIG",
|
"SYSTEM_MEMORY", "SYSTEM_IO", "PCI_CONFIG",
|
||||||
"EC", "SMBUS", "CMOS", "PCI_BAR_TARGET"};
|
"EC", "SMBUS", "CMOS", "PCI_BAR_TARGET"};
|
||||||
|
|
||||||
@ -282,7 +282,7 @@ aml_vm_space_handler(
|
|||||||
}
|
}
|
||||||
*Value = value;
|
*Value = value;
|
||||||
if (Prompt) {
|
if (Prompt) {
|
||||||
sprintf(msg, "[read (%s, %2d, 0x%x)]",
|
sprintf(msg, "[read (%s, %2d, 0x%jx)]",
|
||||||
space_names[SpaceID], BitWidth, Address);
|
space_names[SpaceID], BitWidth, Address);
|
||||||
*Value = aml_simulate_prompt(msg, value);
|
*Value = aml_simulate_prompt(msg, value);
|
||||||
if (*Value != value) {
|
if (*Value != value) {
|
||||||
@ -296,7 +296,7 @@ aml_vm_space_handler(
|
|||||||
case ACPI_WRITE:
|
case ACPI_WRITE:
|
||||||
value = *Value;
|
value = *Value;
|
||||||
if (Prompt) {
|
if (Prompt) {
|
||||||
sprintf(msg, "[write(%s, %2d, 0x%x)]",
|
sprintf(msg, "[write(%s, %2d, 0x%jx)]",
|
||||||
space_names[SpaceID], BitWidth, Address);
|
space_names[SpaceID], BitWidth, Address);
|
||||||
value = aml_simulate_prompt(msg, *Value);
|
value = aml_simulate_prompt(msg, *Value);
|
||||||
}
|
}
|
||||||
@ -321,9 +321,7 @@ aml_vm_space_handler_##name ( \
|
|||||||
UINT32 Function, \
|
UINT32 Function, \
|
||||||
ACPI_PHYSICAL_ADDRESS Address, \
|
ACPI_PHYSICAL_ADDRESS Address, \
|
||||||
UINT32 BitWidth, \
|
UINT32 BitWidth, \
|
||||||
ACPI_INTEGER *Value, \
|
ACPI_INTEGER *Value) \
|
||||||
void *HandlerContext, \
|
|
||||||
void *RegionContext) \
|
|
||||||
{ \
|
{ \
|
||||||
return (aml_vm_space_handler(id, Function, Address, \
|
return (aml_vm_space_handler(id, Function, Address, \
|
||||||
BitWidth, Value, aml_debug_prompt)); \
|
BitWidth, Value, aml_debug_prompt)); \
|
||||||
@ -347,11 +345,10 @@ static int
|
|||||||
load_dsdt(const char *dsdtfile)
|
load_dsdt(const char *dsdtfile)
|
||||||
{
|
{
|
||||||
char filetmp[PATH_MAX];
|
char filetmp[PATH_MAX];
|
||||||
u_int8_t *code, *amlptr;
|
u_int8_t *code;
|
||||||
struct stat sb;
|
struct stat sb;
|
||||||
int fd, fd2;
|
int fd, fd2;
|
||||||
int error;
|
int error;
|
||||||
ACPI_TABLE_HEADER *tableptr;
|
|
||||||
|
|
||||||
fd = open(dsdtfile, O_RDONLY, 0);
|
fd = open(dsdtfile, O_RDONLY, 0);
|
||||||
if (fd == -1) {
|
if (fd == -1) {
|
||||||
@ -396,49 +393,49 @@ load_dsdt(const char *dsdtfile)
|
|||||||
*/
|
*/
|
||||||
if ((error = AcpiInstallAddressSpaceHandler(ACPI_ROOT_OBJECT,
|
if ((error = AcpiInstallAddressSpaceHandler(ACPI_ROOT_OBJECT,
|
||||||
ACPI_ADR_SPACE_SYSTEM_MEMORY,
|
ACPI_ADR_SPACE_SYSTEM_MEMORY,
|
||||||
aml_vm_space_handler_system_memory,
|
(ACPI_ADR_SPACE_HANDLER)aml_vm_space_handler_system_memory,
|
||||||
NULL, NULL)) != AE_OK) {
|
NULL, NULL)) != AE_OK) {
|
||||||
fprintf(stderr, "could not initialise SystemMemory handler: %d\n", error);
|
fprintf(stderr, "could not initialise SystemMemory handler: %d\n", error);
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
if ((error = AcpiInstallAddressSpaceHandler(ACPI_ROOT_OBJECT,
|
if ((error = AcpiInstallAddressSpaceHandler(ACPI_ROOT_OBJECT,
|
||||||
ACPI_ADR_SPACE_SYSTEM_IO,
|
ACPI_ADR_SPACE_SYSTEM_IO,
|
||||||
aml_vm_space_handler_system_io,
|
(ACPI_ADR_SPACE_HANDLER)aml_vm_space_handler_system_io,
|
||||||
NULL, NULL)) != AE_OK) {
|
NULL, NULL)) != AE_OK) {
|
||||||
fprintf(stderr, "could not initialise SystemIO handler: %d\n", error);
|
fprintf(stderr, "could not initialise SystemIO handler: %d\n", error);
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
if ((error = AcpiInstallAddressSpaceHandler(ACPI_ROOT_OBJECT,
|
if ((error = AcpiInstallAddressSpaceHandler(ACPI_ROOT_OBJECT,
|
||||||
ACPI_ADR_SPACE_PCI_CONFIG,
|
ACPI_ADR_SPACE_PCI_CONFIG,
|
||||||
aml_vm_space_handler_pci_config,
|
(ACPI_ADR_SPACE_HANDLER)aml_vm_space_handler_pci_config,
|
||||||
NULL, NULL)) != AE_OK) {
|
NULL, NULL)) != AE_OK) {
|
||||||
fprintf(stderr, "could not initialise PciConfig handler: %d\n", error);
|
fprintf(stderr, "could not initialise PciConfig handler: %d\n", error);
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
if ((error = AcpiInstallAddressSpaceHandler(ACPI_ROOT_OBJECT,
|
if ((error = AcpiInstallAddressSpaceHandler(ACPI_ROOT_OBJECT,
|
||||||
ACPI_ADR_SPACE_EC,
|
ACPI_ADR_SPACE_EC,
|
||||||
aml_vm_space_handler_ec,
|
(ACPI_ADR_SPACE_HANDLER)aml_vm_space_handler_ec,
|
||||||
NULL, NULL)) != AE_OK) {
|
NULL, NULL)) != AE_OK) {
|
||||||
fprintf(stderr, "could not initialise EC handler: %d\n", error);
|
fprintf(stderr, "could not initialise EC handler: %d\n", error);
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
if ((error = AcpiInstallAddressSpaceHandler(ACPI_ROOT_OBJECT,
|
if ((error = AcpiInstallAddressSpaceHandler(ACPI_ROOT_OBJECT,
|
||||||
ACPI_ADR_SPACE_SMBUS,
|
ACPI_ADR_SPACE_SMBUS,
|
||||||
aml_vm_space_handler_smbus,
|
(ACPI_ADR_SPACE_HANDLER)aml_vm_space_handler_smbus,
|
||||||
NULL, NULL)) != AE_OK) {
|
NULL, NULL)) != AE_OK) {
|
||||||
fprintf(stderr, "could not initialise SMBUS handler: %d\n", error);
|
fprintf(stderr, "could not initialise SMBUS handler: %d\n", error);
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
if ((error = AcpiInstallAddressSpaceHandler(ACPI_ROOT_OBJECT,
|
if ((error = AcpiInstallAddressSpaceHandler(ACPI_ROOT_OBJECT,
|
||||||
ACPI_ADR_SPACE_CMOS,
|
ACPI_ADR_SPACE_CMOS,
|
||||||
aml_vm_space_handler_cmos,
|
(ACPI_ADR_SPACE_HANDLER)aml_vm_space_handler_cmos,
|
||||||
NULL, NULL)) != AE_OK) {
|
NULL, NULL)) != AE_OK) {
|
||||||
fprintf(stderr, "could not initialise CMOS handler: %d\n", error);
|
fprintf(stderr, "could not initialise CMOS handler: %d\n", error);
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
if ((error = AcpiInstallAddressSpaceHandler(ACPI_ROOT_OBJECT,
|
if ((error = AcpiInstallAddressSpaceHandler(ACPI_ROOT_OBJECT,
|
||||||
ACPI_ADR_SPACE_PCI_BAR_TARGET,
|
ACPI_ADR_SPACE_PCI_BAR_TARGET,
|
||||||
aml_vm_space_handler_pci_bar_target,
|
(ACPI_ADR_SPACE_HANDLER)aml_vm_space_handler_pci_bar_target,
|
||||||
NULL, NULL)) != AE_OK) {
|
NULL, NULL)) != AE_OK) {
|
||||||
fprintf(stderr, "could not initialise PCI BAR TARGET handler: %d\n", error);
|
fprintf(stderr, "could not initialise PCI BAR TARGET handler: %d\n", error);
|
||||||
return (-1);
|
return (-1);
|
||||||
|
Loading…
Reference in New Issue
Block a user