diff options
| author | Jordan Hargrave <jordan@cvs.openbsd.org> | 2010-07-22 13:46:43 +0000 |
|---|---|---|
| committer | Jordan Hargrave <jordan@cvs.openbsd.org> | 2010-07-22 13:46:43 +0000 |
| commit | b65bb8b3c0ded9484111af4c6c25ebd805253412 (patch) | |
| tree | 0521e14e6a59e57490a4c007d4892c36ef0157ea /sys | |
| parent | 434bf2b621d604399ca549f4e893ff826429adbf (diff) | |
Remove unused function prototypes
Add flags and type codes for AML resources
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/acpi/dsdt.h | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/sys/dev/acpi/dsdt.h b/sys/dev/acpi/dsdt.h index c27d764ece2..6a2848062bb 100644 --- a/sys/dev/acpi/dsdt.h +++ b/sys/dev/acpi/dsdt.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dsdt.h,v 1.52 2010/07/21 19:35:15 deraadt Exp $ */ +/* $OpenBSD: dsdt.h,v 1.53 2010/07/22 13:46:42 jordan Exp $ */ /* * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org> * @@ -31,6 +31,7 @@ struct aml_scope { struct aml_value *retv; uint8_t *start; int type; + int rep; }; @@ -47,8 +48,6 @@ struct aml_node *aml_searchname(struct aml_node *, const void *); struct aml_node *aml_searchrel(struct aml_node *, const void *); struct aml_value *aml_getstack(struct aml_scope *, int); -struct aml_value *aml_allocint(uint64_t); -struct aml_value *aml_allocstr(const char *); struct aml_value *aml_allocvalue(int, int64_t, const void *); void aml_freevalue(struct aml_value *); void aml_notify(struct aml_node *, int); @@ -79,6 +78,16 @@ void aml_create_defaultobjects(void); const char *aml_nodename(struct aml_node *); +#define SRT_IRQ2 0x22 +#define SRT_IRQ3 0x23 +#define SRT_DMA 0x2A +#define SRT_STARTDEP0 0x30 +#define SRT_STARTDEP1 0x31 +#define SRT_ENDDEP 0x38 +#define SRT_IOPORT 0x47 +#define SRT_FIXEDPORT 0x4B +#define SRT_ENDTAG 0x78 + #define SR_IRQ 0x04 #define SR_DMA 0x05 #define SR_STARTDEP 0x06 @@ -110,15 +119,24 @@ union acpi_resource { uint8_t typecode; uint16_t irq_mask; uint8_t irq_flags; +#define SR_IRQ_SHR (1L << 4) +#define SR_IRQ_POLARITY (1L << 3) +#define SR_IRQ_MODE (1L << 0) } __packed sr_irq; struct { uint8_t typecode; uint8_t channel; uint8_t flags; +#define SR_DMA_TYP_MASK 0x3 +#define SR_DMA_TYP_SHIFT 5 +#define SR_DMA_BM (1L << 2) +#define SR_DMA_SIZE_MASK 0x3 +#define SR_DMA_SIZE_SHIFT 0 } __packed sr_dma; struct { uint8_t typecode; uint8_t flags; +#define SR_IOPORT_DEC (1L << 0) uint16_t _min; uint16_t _max; uint8_t _aln; |