git: 9front

Info  •  Files  •  Log  •  Branches

scram: cleanup

--- 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 @@

 	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 @@

 			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 @@

 void

 outw(long addr, short val)

 {

-	char buf[2];

+	uchar buf[2];

 	buf[0] = val;

 	buf[1] = val >> 8;

-- 

⑨