diff options
| author | cinap_lenrek <cinap_lenrek@gmx.de> | 2012-06-29 17:18:43 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@gmx.de> | 2012-06-29 17:18:43 +0200 |
| commit | 33cec5c41163fb37156ab43d510442910b8e49cd (patch) | |
| tree | 0088c586b1a9dbf79c4d42407551ebb591b8cc54 | |
| parent | 1eff3709b4b9e257e536f6a2c8926bc5c519a532 (diff) | |
scram: cleanup
| -rw-r--r-- | sys/src/cmd/scram.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/src/cmd/scram.c b/sys/src/cmd/scram.c index 83fc6c26c..93db59c47 100644 --- a/sys/src/cmd/scram.c +++ b/sys/src/cmd/scram.c @@ -3,8 +3,9 @@ #include <libc.h> #include <aml.h> +int fd, iofd; struct Ureg u; -int fd, iofd, PM1A_CNT_BLK, PM1B_CNT_BLK, SLP_TYPa, SLP_TYPb; +ulong PM1A_CNT_BLK, PM1B_CNT_BLK, SLP_TYPa, SLP_TYPb; typedef struct Tbl Tbl; struct Tbl { @@ -30,7 +31,7 @@ amlfree(void *p){ free(p); } -static uint +static ulong get32(uchar *p){ return p[3]<<24 | p[2]<<16 | p[1]<<8 | p[0]; } @@ -63,7 +64,7 @@ loadacpi(void) break; if(n != sizeof(*t)) return -1; - l = *(ulong*)(t->len); + l = get32(t->len); if(l < sizeof(*t)) return -1; t = realloc(t, l); @@ -96,7 +97,7 @@ loadacpi(void) void outw(long addr, short val) { - char buf[2]; + uchar buf[2]; buf[0] = val; buf[1] = val >> 8; |