projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-3.20/bdi' of git://git.kernel.dk/linux-block
[firefly-linux-kernel-4.4.55.git]
/
include
/
acpi
/
actypes.h
diff --git
a/include/acpi/actypes.h
b/include/acpi/actypes.h
index bbef17368e49fb65c0870f54ab59e388a76e4e62..b034f1068dfe40f6c0496f388dad310f491dcbe8 100644
(file)
--- a/
include/acpi/actypes.h
+++ b/
include/acpi/actypes.h
@@
-5,7
+5,7
@@
*****************************************************************************/
/*
*****************************************************************************/
/*
- * Copyright (C) 2000 - 201
4
, Intel Corp.
+ * Copyright (C) 2000 - 201
5
, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-744,7
+744,7
@@
typedef u32 acpi_event_status;
/*
* GPE info flags - Per GPE
* +-------+-+-+---+
/*
* GPE info flags - Per GPE
* +-------+-+-+---+
- * | 7:
4 |3|2|1
:0|
+ * | 7:
5 |4|3|2
:0|
* +-------+-+-+---+
* | | | |
* | | | +-- Type of dispatch:to method, handler, notify, or none
* +-------+-+-+---+
* | | | |
* | | | +-- Type of dispatch:to method, handler, notify, or none
@@
-756,13
+756,15
@@
typedef u32 acpi_event_status;
#define ACPI_GPE_DISPATCH_METHOD (u8) 0x01
#define ACPI_GPE_DISPATCH_HANDLER (u8) 0x02
#define ACPI_GPE_DISPATCH_NOTIFY (u8) 0x03
#define ACPI_GPE_DISPATCH_METHOD (u8) 0x01
#define ACPI_GPE_DISPATCH_HANDLER (u8) 0x02
#define ACPI_GPE_DISPATCH_NOTIFY (u8) 0x03
-#define ACPI_GPE_DISPATCH_MASK (u8) 0x03
+#define ACPI_GPE_DISPATCH_RAW_HANDLER (u8) 0x04
+#define ACPI_GPE_DISPATCH_MASK (u8) 0x07
+#define ACPI_GPE_DISPATCH_TYPE(flags) ((u8) ((flags) & ACPI_GPE_DISPATCH_MASK))
-#define ACPI_GPE_LEVEL_TRIGGERED (u8) 0x0
4
+#define ACPI_GPE_LEVEL_TRIGGERED (u8) 0x0
8
#define ACPI_GPE_EDGE_TRIGGERED (u8) 0x00
#define ACPI_GPE_EDGE_TRIGGERED (u8) 0x00
-#define ACPI_GPE_XRUPT_TYPE_MASK (u8) 0x0
4
+#define ACPI_GPE_XRUPT_TYPE_MASK (u8) 0x0
8
-#define ACPI_GPE_CAN_WAKE (u8) 0x
08
+#define ACPI_GPE_CAN_WAKE (u8) 0x
10
/*
* Flags for GPE and Lock interfaces
/*
* Flags for GPE and Lock interfaces