i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some corrections and cleanup to ACPI Embedded controller:

Browse Source 
* Exposed ACPI API needed by Embedded Controller
	This will be removed again if moved inside the bus manager.
	It also duplicates ACPI's own headers so it might go out of sync atm.
 * Added mutex to controller and fixed the mixup between acpi_status needed in int handlers and Haiku status.
 * Major code cleanup
	Not for headers as they are mostly redundant if we move the controller.
	Variable names still needs some cleanup

This makes the ACPI errors from the controller understandable. I get AE_NO_HARDWARE_RESPONSE now.



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36318 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Fredrik Holmqvist
2010-04-15 19:23:43 +00:00
parent dd41712c26
commit 186058c517
3 changed files with 585 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/drivers/ACPI.h
+23 -3
View File
@@ -34,7 +34,8 @@ enum {
ACPI_ADR_SPACE_SMBUS = 4,
ACPI_ADR_SPACE_CMOS = 5,
ACPI_ADR_SPACE_PCI_BAR_TARGET = 6,
ACPI_ADR_SPACE_DATA_TABLE = 7,
ACPI_ADR_SPACE_IPMI = 7,
ACPI_ADR_SPACE_DATA_TABLE = 8,
ACPI_ADR_SPACE_FIXED_HARDWARE = 127
};
@@ -66,6 +67,8 @@ enum {
ACPI_TYPE_PROCESSOR,
ACPI_TYPE_THERMAL,
ACPI_TYPE_BUFFER_FIELD,
ACPI_TYPE_DDB_HANDLE,
ACPI_TYPE_DEBUG_OBJECT,
ACPI_TYPE_LOCAL_REFERENCE = 0x14
};
@@ -123,6 +126,23 @@ enum {
ACPI_ALLOCATE_BUFFER = -1,
};
/*
* acpi_status should return ACPI specific error codes, not BeOS ones.
*/
typedef uint32 acpi_status;
#define AE_CODE_PROGRAMMER 0x1000
#define AE_OK 0x0000
#define AE_ERROR 0x0001
#define AE_NOT_ACQUIRED 0x0014
#define AE_NO_HARDWARE_RESPONSE 0x0016
#define AE_BAD_PARAMETER (0x0001 | AE_CODE_PROGRAMMER)
#define AE_BAD_ADDRESS (0x0009 | AE_CODE_PROGRAMMER)
#else
#error "Our ACPI.h uses different naming than actypes.h.\n" \\
"If you need actypes.h this probably needs updating."
#endif // __ACTYPES_H__
@@ -146,11 +166,11 @@ typedef struct acpi_prt
typedef uint32 (*acpi_event_handler)(void *Context);
typedef status_t (*acpi_adr_space_handler)(uint32 function,
typedef acpi_status (*acpi_adr_space_handler)(uint32 function,
acpi_physical_address address, uint32 bitWidth, int *value,
void *handlerContext, void *regionContext);
typedef status_t (*acpi_adr_space_setup)(acpi_handle regionHandle,
typedef acpi_status (*acpi_adr_space_setup)(acpi_handle regionHandle,
uint32 function, void *handlerContext, void **regionContext);
typedef void (*acpi_notify_handler)(acpi_handle device, uint32 value,
src/add-ons/kernel/drivers/power/acpi_embedded_controller/acpi_embedded_controller.cpp
+533 -545
View File
File diff suppressed because it is too large Load Diff
src/add-ons/kernel/drivers/power/acpi_embedded_controller/acpi_embedded_controller.h
+29 -27
View File
@@ -36,7 +36,7 @@
#include <dpc.h>
#include <Drivers.h>
#include <KernelExport.h>
#include <lock.h>
// #define TRACE_EMBEDDED_CONTROLLER
#ifdef TRACE_EMBEDDED_CONTROLLER
@@ -117,6 +117,7 @@ AcpiUtStrupr(char *SrcString)
#define ACPI_READ 0
#define ACPI_WRITE 1
typedef uint8 EC_COMMAND;
#define EC_COMMAND_UNKNOWN ((EC_COMMAND) 0x00)
#define EC_COMMAND_READ ((EC_COMMAND) 0x80)
@@ -148,32 +149,26 @@ AcpiUtStrupr(char *SrcString)
typedef uint8 EC_STATUS;
#define EC_FLAG_OUTPUT_BUFFER ((uint8) 0x01)
#define EC_FLAG_INPUT_BUFFER ((uint8) 0x02)
#define EC_FLAG_DATA_IS_CMD ((uint8) 0x08)
#define EC_FLAG_BURST_MODE ((uint8) 0x10)
#define EC_FLAG_OUTPUT_BUFFER ((EC_STATUS) 0x01)
#define EC_FLAG_INPUT_BUFFER ((EC_STATUS) 0x02)
#define EC_FLAG_DATA_IS_CMD ((EC_STATUS) 0x08)
#define EC_FLAG_BURST_MODE ((EC_STATUS) 0x10)
/*
* EC_EVENT:
* ---------
*/
typedef uint8 EC_EVENT;
#define EC_EVENT_UNKNOWN ((uint8) 0x00)
#define EC_EVENT_OUTPUT_BUFFER_FULL ((uint8) 0x01)
#define EC_EVENT_INPUT_BUFFER_EMPTY ((uint8) 0x02)
#define EC_EVENT_SCI ((uint8) 0x20)
#define EC_EVENT_SMI ((uint8) 0x40)
#define EC_EVENT_UNKNOWN ((EC_EVENT) 0x00)
#define EC_EVENT_OUTPUT_BUFFER_FULL ((EC_EVENT) 0x01)
#define EC_EVENT_INPUT_BUFFER_EMPTY ((EC_EVENT) 0x02)
#define EC_EVENT_SCI ((EC_EVENT) 0x20)
#define EC_EVENT_SMI ((EC_EVENT) 0x40)
/* Data byte returned after burst enable indicating it was successful. */
#define EC_BURST_ACK 0x90
/* Total time in ms spent waiting for a response from EC. */
#define EC_TIMEOUT 750
static int ec_burst_mode = 1;
static int ec_polled_mode = 0;
static int ec_timeout = EC_TIMEOUT;
/*
* Register access primitives
@@ -214,6 +209,7 @@ struct acpi_ec_cookie {
int ec_glk;
uint32 ec_glkhandle;
mutex ec_lock;
int ec_burstactive;
int ec_sci_pending;
vint32 ec_gencount;
@@ -243,11 +239,17 @@ struct acpi_ec_cookie {
((status) & EC_FLAG_INPUT_BUFFER) == 0))
static int ec_burst_mode = 1;
static int ec_polled_mode = 0;
static int ec_timeout = EC_TIMEOUT;
static status_t
EcLock(struct acpi_ec_cookie *sc)
{
status_t status;
/* If _GLK is non-zero, acquire the global lock. */
status = B_OK;
if (sc->ec_glk) {
@@ -256,7 +258,7 @@ EcLock(struct acpi_ec_cookie *sc)
if (status != B_OK)
return status;
}
mutex_lock(&sc->ec_lock);
return status;
}
@@ -264,26 +266,26 @@ EcLock(struct acpi_ec_cookie *sc)
static void
EcUnlock(struct acpi_ec_cookie *sc)
{
mutex_unlock(&sc->ec_lock);
if (sc->ec_glk)
sc->ec_acpi_module->release_global_lock(sc->ec_glkhandle);
}
typedef unsigned int EC_EVENT;
typedef unsigned int EC_COMMAND;
static uint32 EcGpeHandler(void *context);
static status_t EcSpaceSetup(acpi_handle region, uint32 function,
static acpi_status EcSpaceSetup(acpi_handle region, uint32 function,
void *context, void **return_Context);
static status_t EcSpaceHandler(uint32 function,
static acpi_status EcSpaceHandler(uint32 function,
acpi_physical_address address,
uint32 width, int *value,
void *context, void *regionContext);
static status_t EcWaitEvent(struct acpi_ec_cookie *sc, EC_EVENT event,
int32 gen_count);
static status_t EcCommand(struct acpi_ec_cookie *sc, EC_COMMAND cmd);
static status_t EcRead(struct acpi_ec_cookie *sc, uint8 address,
static acpi_status EcWaitEvent(struct acpi_ec_cookie *sc, EC_EVENT event,
int32 gen_count);
static acpi_status EcCommand(struct acpi_ec_cookie *sc, EC_COMMAND cmd);
static acpi_status EcRead(struct acpi_ec_cookie *sc, uint8 address,
uint8 *readData);
static status_t EcWrite(struct acpi_ec_cookie *sc, uint8 address,
static acpi_status EcWrite(struct acpi_ec_cookie *sc, uint8 address,
uint8 *writeData);