diff options
author | Jung-uk Kim <jkim@FreeBSD.org> | 2015-02-18 20:33:00 +0000 |
---|---|---|
committer | Jung-uk Kim <jkim@FreeBSD.org> | 2015-02-18 20:33:00 +0000 |
commit | 1c0e1b6da9c3c45f81c75137dddaebc748995afc (patch) | |
tree | fb0545399f40531160cc35b45423b4a49e6dbb79 /sys/contrib/dev/acpica/include/acbuffer.h | |
parent | 784b6cd5e95df258eab273f2b4f29566d73525d5 (diff) | |
parent | e8991236d498c9646c20a8acf0236cf3342dad6f (diff) | |
download | src-1c0e1b6da9c3c45f81c75137dddaebc748995afc.tar.gz src-1c0e1b6da9c3c45f81c75137dddaebc748995afc.zip |
Merge ACPICA 20141107 and 20150204.
Notes
Notes:
svn path=/head/; revision=278970
Diffstat (limited to 'sys/contrib/dev/acpica/include/acbuffer.h')
-rw-r--r-- | sys/contrib/dev/acpica/include/acbuffer.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sys/contrib/dev/acpica/include/acbuffer.h b/sys/contrib/dev/acpica/include/acbuffer.h index a36a980aa954..37f4170884d8 100644 --- a/sys/contrib/dev/acpica/include/acbuffer.h +++ b/sys/contrib/dev/acpica/include/acbuffer.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2014, Intel Corp. + * Copyright (C) 2000 - 2015, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -119,7 +119,9 @@ typedef struct acpi_pld_info { UINT8 Revision; UINT8 IgnoreColor; - UINT32 Color; + UINT8 Red; + UINT8 Green; + UINT8 Blue; UINT16 Width; UINT16 Height; UINT8 UserVisible; @@ -165,8 +167,14 @@ typedef struct acpi_pld_info #define ACPI_PLD_GET_IGNORE_COLOR(dword) ACPI_GET_BITS (dword, 7, ACPI_1BIT_MASK) #define ACPI_PLD_SET_IGNORE_COLOR(dword,value) ACPI_SET_BITS (dword, 7, ACPI_1BIT_MASK, value) /* Offset 7, Len 1 */ -#define ACPI_PLD_GET_COLOR(dword) ACPI_GET_BITS (dword, 8, ACPI_24BIT_MASK) -#define ACPI_PLD_SET_COLOR(dword,value) ACPI_SET_BITS (dword, 8, ACPI_24BIT_MASK, value) /* Offset 8, Len 24 */ +#define ACPI_PLD_GET_RED(dword) ACPI_GET_BITS (dword, 8, ACPI_8BIT_MASK) +#define ACPI_PLD_SET_RED(dword,value) ACPI_SET_BITS (dword, 8, ACPI_8BIT_MASK, value) /* Offset 8, Len 8 */ + +#define ACPI_PLD_GET_GREEN(dword) ACPI_GET_BITS (dword, 16, ACPI_8BIT_MASK) +#define ACPI_PLD_SET_GREEN(dword,value) ACPI_SET_BITS (dword, 16, ACPI_8BIT_MASK, value) /* Offset 16, Len 8 */ + +#define ACPI_PLD_GET_BLUE(dword) ACPI_GET_BITS (dword, 24, ACPI_8BIT_MASK) +#define ACPI_PLD_SET_BLUE(dword,value) ACPI_SET_BITS (dword, 24, ACPI_8BIT_MASK, value) /* Offset 24, Len 8 */ /* Second 32-bit dword, bits 33:63 */ |