diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2016-01-09 10:50:44 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2016-01-09 10:50:44 +0000 |
| commit | 8d2dc85156734d9cd150c3e246fc5ee8b2285a56 (patch) | |
| tree | 81fff483afecfd98fcd4c628bfa8afdadca9d0a4 /sys/dev | |
| parent | 9ca018bce40324215dc0de33c6fea2033d52e9dd (diff) | |
Rename LR_24BIT, LR_32BIT and LR_32BITFIXED to LR_MEM24, LR_MEM32 and
LR_MEM32FIXED to better match the names used in the specification.
Add lr_m32fixed to union acpi_resource.
ok jcs@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/acpi/dsdt.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sys/dev/acpi/dsdt.h b/sys/dev/acpi/dsdt.h index eaece75ccfc..c1e1090038f 100644 --- a/sys/dev/acpi/dsdt.h +++ b/sys/dev/acpi/dsdt.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dsdt.h,v 1.64 2015/06/13 21:41:42 guenther Exp $ */ +/* $OpenBSD: dsdt.h,v 1.65 2016/01/09 10:50:43 kettenis Exp $ */ /* * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org> * @@ -95,10 +95,10 @@ const char *aml_nodename(struct aml_node *); /* byte zero of small resources combines the tag above a length [1..7] */ #define SR_TAG(tag,len) ((tag << 3) + (len)) -#define LR_24BIT 0x81 +#define LR_MEM24 0x81 #define LR_GENREGISTER 0x82 -#define LR_32BIT 0x85 -#define LR_32BITFIXED 0x86 +#define LR_MEM32 0x85 +#define LR_MEM32FIXED 0x86 #define LR_DWORD 0x87 #define LR_WORD 0x88 #define LR_EXTIRQ 0x89 @@ -169,6 +169,13 @@ union acpi_resource { struct { uint8_t typecode; uint16_t length; + uint8_t _info; + uint32_t _bas; + uint32_t _len; + } __packed lr_m32fixed; + struct { + uint8_t typecode; + uint16_t length; uint8_t flags; #define LR_EXTIRQ_SHR (1L << 3) #define LR_EXTIRQ_POLARITY (1L << 2) |