Page MenuHomeFreeBSD
Differential D27267

callout(9): Remove some leftover APM BIOS support
ClosedPublic
Actions

Authored by markj on Nov 18 2020, 2:33 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 8, 9:16 AM
Unknown Object (File)
Tue, Mar 4, 11:31 AM
Unknown Object (File)
Sat, Feb 22, 2:37 PM
Unknown Object (File)
Feb 11 2025, 3:35 AM
Unknown Object (File)
Feb 11 2025, 3:34 AM
Unknown Object (File)
Feb 10 2025, 6:58 PM
Unknown Object (File)
Jan 25 2025, 8:03 PM
Unknown Object (File)
Jan 16 2025, 10:09 PM
View All 49 Files
Subscribers
None

Details

Reviewers
imp
Commits
rS368112: callout(9): Remove some leftover APM BIOS support
Summary

This code is obselete since r366546.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

markj requested review of this revision.Nov 18 2020, 2:33 PM
markj created this revision.
Harbormaster completed remote builds in B34879: Diff 79701.Nov 18 2020, 2:33 PM
markj added a reviewer: imp.Nov 18 2020, 2:33 PM
imp accepted this revision.Nov 27 2020, 5:52 PM

Doh! That was on my hitlist for APM removal..

This revision is now accepted and ready to land.Nov 27 2020, 5:52 PM
Closed by commit rS368112: callout(9): Remove some leftover APM BIOS support (authored by markj). · Explain WhyNov 27 2020, 8:46 PM
This revision was automatically updated to reflect the committed changes.
markj added a commit: rS368112: callout(9): Remove some leftover APM BIOS support.

Revision Contents
Changeset List

PathSize
head/
sys/
kern/
65 lines
sys/
5 lines

Diff 80073

View Options

head/sys/kern/kern_timeout.c

Show First 20 Lines • Show All 126 Lines • ▼ Show 20 Linesstruct i2c_hid_desc {
uint16_t wVersionID; uint16_t wVersionID;
uint32_t reserved; uint32_t reserved;
} __packed; } __packed;
#define IICHID_REG_NONE -1 #define IICHID_REG_NONE -1
#define IICHID_REG_ACPI (UINT16_MAX + 1) #define IICHID_REG_ACPI (UINT16_MAX + 1)
#define IICHID_REG_ELAN 0x0001 #define IICHID_REG_ELAN 0x0001
static const struct iichid_id { static char * iichid_ids[] = {
char *id; "ELAN0000",
int reg; "PNP0C50",
} iichid_ids[] = { "ACPI0C50",
{ "ELAN0000", IICHID_REG_ELAN }, NULL,
{ "PNP0C50", IICHID_REG_ACPI },
{ "ACPI0C50", IICHID_REG_ACPI },
{ NULL, 0 },
}; };
static int iichid_regs[] = {
IICHID_REG_ELAN,
IICHID_REG_ACPI,
IICHID_REG_ACPI,
IICHID_REG_NONE,
};
enum iichid_powerstate_how { enum iichid_powerstate_how {
IICHID_PS_NULL, IICHID_PS_NULL,
IICHID_PS_ON, IICHID_PS_ON,
IICHID_PS_OFF, IICHID_PS_OFF,
}; };
/* /*
* Locking: no internal locks are used. To serialize access to shared members, * Locking: no internal locks are used. To serialize access to shared members,
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines
static int iichid_setup_callout(struct iichid_softc *); static int iichid_setup_callout(struct iichid_softc *);
static int iichid_reset_callout(struct iichid_softc *); static int iichid_reset_callout(struct iichid_softc *);
static void iichid_teardown_callout(struct iichid_softc *); static void iichid_teardown_callout(struct iichid_softc *);
#endif #endif
static inline int static inline int
acpi_is_iichid(ACPI_HANDLE handle) acpi_is_iichid(ACPI_HANDLE handle)
{ {
const struct iichid_id *ids;
UINT32 sta; UINT32 sta;
int reg; int i, reg = IICHID_REG_NONE;
for (ids = iichid_ids; ids->id != NULL; ids++) { for (i = 0; i < nitems(iichid_ids); i++) {
if (acpi_MatchHid(handle, ids->id)) { if (acpi_MatchHid(handle, iichid_ids[i])) {
reg = ids->reg; reg = iichid_regs[i];
break; break;
} }
} }
if (ids->id == NULL) if (reg == IICHID_REG_NONE)
return (IICHID_REG_NONE); return (IICHID_REG_NONE);
/* /*
* If no _STA method or if it failed, then assume that * If no _STA method or if it failed, then assume that
* the device is present. * the device is present.
*/ */
if (ACPI_FAILURE(acpi_GetInteger(handle, "_STA", &sta)) || if (ACPI_FAILURE(acpi_GetInteger(handle, "_STA", &sta)) ||
ACPI_DEVICE_PRESENT(sta)) ACPI_DEVICE_PRESENT(sta))
▲ Show 20 Lines • Show All 1,117 Lines • Show Last 20 Lines
View Options

head/sys/sys/systm.h

Show First 20 Lines • Show All 126 Lines • ▼ Show 20 Linesstruct i2c_hid_desc {
uint16_t wVersionID; uint16_t wVersionID;
uint32_t reserved; uint32_t reserved;
} __packed; } __packed;
#define IICHID_REG_NONE -1 #define IICHID_REG_NONE -1
#define IICHID_REG_ACPI (UINT16_MAX + 1) #define IICHID_REG_ACPI (UINT16_MAX + 1)
#define IICHID_REG_ELAN 0x0001 #define IICHID_REG_ELAN 0x0001
static const struct iichid_id { static char * iichid_ids[] = {
char *id; "ELAN0000",
int reg; "PNP0C50",
} iichid_ids[] = { "ACPI0C50",
{ "ELAN0000", IICHID_REG_ELAN }, NULL,
{ "PNP0C50", IICHID_REG_ACPI },
{ "ACPI0C50", IICHID_REG_ACPI },
{ NULL, 0 },
}; };
static int iichid_regs[] = {
IICHID_REG_ELAN,
IICHID_REG_ACPI,
IICHID_REG_ACPI,
IICHID_REG_NONE,
};
enum iichid_powerstate_how { enum iichid_powerstate_how {
IICHID_PS_NULL, IICHID_PS_NULL,
IICHID_PS_ON, IICHID_PS_ON,
IICHID_PS_OFF, IICHID_PS_OFF,
}; };
/* /*
* Locking: no internal locks are used. To serialize access to shared members, * Locking: no internal locks are used. To serialize access to shared members,
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines
static int iichid_setup_callout(struct iichid_softc *); static int iichid_setup_callout(struct iichid_softc *);
static int iichid_reset_callout(struct iichid_softc *); static int iichid_reset_callout(struct iichid_softc *);
static void iichid_teardown_callout(struct iichid_softc *); static void iichid_teardown_callout(struct iichid_softc *);
#endif #endif
static inline int static inline int
acpi_is_iichid(ACPI_HANDLE handle) acpi_is_iichid(ACPI_HANDLE handle)
{ {
const struct iichid_id *ids;
UINT32 sta; UINT32 sta;
int reg; int i, reg = IICHID_REG_NONE;
for (ids = iichid_ids; ids->id != NULL; ids++) { for (i = 0; i < nitems(iichid_ids); i++) {
if (acpi_MatchHid(handle, ids->id)) { if (acpi_MatchHid(handle, iichid_ids[i])) {
reg = ids->reg; reg = iichid_regs[i];
break; break;
} }
} }
if (ids->id == NULL) if (reg == IICHID_REG_NONE)
return (IICHID_REG_NONE); return (IICHID_REG_NONE);
/* /*
* If no _STA method or if it failed, then assume that * If no _STA method or if it failed, then assume that
* the device is present. * the device is present.
*/ */
if (ACPI_FAILURE(acpi_GetInteger(handle, "_STA", &sta)) || if (ACPI_FAILURE(acpi_GetInteger(handle, "_STA", &sta)) ||
ACPI_DEVICE_PRESENT(sta)) ACPI_DEVICE_PRESENT(sta))
▲ Show 20 Lines • Show All 1,117 Lines • Show Last 20 Lines