Android-x86
Forkdevice/generic/common
| Revisión | e0b0df2a15e2c997ea9bac8a6ff2a24a9fb9a6a9 (tree) |
|---|---|
| Tiempo | 2018-06-21 19:55:05 |
| Autor | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
tp_smapi/tp_smapi.c (diff)| @@ -107,7 +107,7 @@ static struct { u8 rc; char *msg; int ret; } smapi_retcode[] = | ||
| 107 | 107 | |
| 108 | 108 | #define SMAPI_MAX_RETRIES 10 |
| 109 | 109 | #define SMAPI_PORT2 0x4F /* fixed port, meaning unclear */ |
| 110 | -static unsigned short smapi_port; /* APM control port, normally 0xB2 */ | |
| 110 | +static u16 smapi_port; /* APM control port, normally 0xB2 */ | |
| 111 | 111 | |
| 112 | 112 | #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) |
| 113 | 113 | static DECLARE_MUTEX(smapi_mutex); |
| @@ -199,7 +199,7 @@ static int smapi_request(u32 inEBX, u32 inECX, | ||
| 199 | 199 | "=m"(tmpEDI), |
| 200 | 200 | "=m"(tmpESI) |
| 201 | 201 | :"m"(inEBX), "m"(inECX), "m"(inEDI), "m"(inESI), |
| 202 | - "m"((u16)smapi_port) | |
| 202 | + "m"(smapi_port) | |
| 203 | 203 | :"%eax", "%ebx", "%ecx", "%edx", "%edi", |
| 204 | 204 | "%esi"); |
| 205 | 205 |
