Deleted Added
full compact
OsdTable.c (167814) OsdTable.c (193530)
1/*-
2 * Copyright (c) 2002 Mitsaru Iwasaki
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * SUCH DAMAGE.
25 */
26
27/*
28 * ACPI Table interfaces
29 */
30
31#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2002 Mitsaru Iwasaki
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * SUCH DAMAGE.
25 */
26
27/*
28 * ACPI Table interfaces
29 */
30
31#include <sys/cdefs.h>
32__FBSDID("$FreeBSD: head/sys/dev/acpica/Osd/OsdTable.c 167814 2007-03-22 18:16:43Z jkim $");
32__FBSDID("$FreeBSD: head/sys/dev/acpica/Osd/OsdTable.c 193530 2009-06-05 18:44:36Z jkim $");
33
34#include <sys/param.h>
35#include <sys/endian.h>
36#include <sys/kernel.h>
37#include <sys/linker.h>
38
33
34#include <sys/param.h>
35#include <sys/endian.h>
36#include <sys/kernel.h>
37#include <sys/linker.h>
38
39#include
40#include
39#include <contrib/dev/acpica/include/acpi.h>
40#include <contrib/dev/acpica/include/actables.h>
41
42#undef _COMPONENT
43#define _COMPONENT ACPI_TABLES
44
45static char acpi_osname[128];
46TUNABLE_STR("hw.acpi.osname", acpi_osname, sizeof(acpi_osname));
47
48ACPI_STATUS

--- 13 unchanged lines hidden (view full) ---

62
63 return (AE_OK);
64}
65
66ACPI_STATUS
67AcpiOsTableOverride(ACPI_TABLE_HEADER *ExistingTable,
68 ACPI_TABLE_HEADER **NewTable)
69{
41
42#undef _COMPONENT
43#define _COMPONENT ACPI_TABLES
44
45static char acpi_osname[128];
46TUNABLE_STR("hw.acpi.osname", acpi_osname, sizeof(acpi_osname));
47
48ACPI_STATUS

--- 13 unchanged lines hidden (view full) ---

62
63 return (AE_OK);
64}
65
66ACPI_STATUS
67AcpiOsTableOverride(ACPI_TABLE_HEADER *ExistingTable,
68 ACPI_TABLE_HEADER **NewTable)
69{
70 caddr_t acpi_dsdt, p;
70 char modname[] = "acpi_dsdt";
71 caddr_t acpi_table, p, s;
71
72 if (ExistingTable == NULL || NewTable == NULL)
73 return (AE_BAD_PARAMETER);
74
72
73 if (ExistingTable == NULL || NewTable == NULL)
74 return (AE_BAD_PARAMETER);
75
76#ifdef notyet
77 for (int i = 0; i < ACPI_NAME_SIZE; i++)
78 modname[i + 5] = tolower(ExistingTable->Signature[i]);
79#else
75 /* If we're not overriding the DSDT, just return. */
80 /* If we're not overriding the DSDT, just return. */
76 if ((acpi_dsdt = preload_search_by_type("acpi_dsdt")) == NULL ||
77 (p = preload_search_info(acpi_dsdt, MODINFO_ADDR)) == NULL) {
81 if (strncmp(ExistingTable->Signature, ACPI_SIG_DSDT, ACPI_NAME_SIZE) != 0) {
78 *NewTable = NULL;
82 *NewTable = NULL;
79 } else
83 return (AE_OK);
84 }
85#endif
86
87 if ((acpi_table = preload_search_by_type(modname)) != NULL &&
88 (p = preload_search_info(acpi_table, MODINFO_ADDR)) != NULL &&
89 (s = preload_search_info(acpi_table, MODINFO_SIZE)) != NULL &&
90 *(size_t *)s != 0)
80 *NewTable = *(ACPI_TABLE_HEADER **)p;
91 *NewTable = *(ACPI_TABLE_HEADER **)p;
92 else
93 *NewTable = NULL;
81
82 return (AE_OK);
83}
94
95 return (AE_OK);
96}