etheriwl: implement 4965 firmware bootstrap (untested)

[plan9front.git] / sys / src / 9 / pc / devarch.c

diff --git a/sys/src/9/pc/devarch.c b/sys/src/9/pc/devarch.c
index fc407fa6ae433afe10f2e40ebea21dcfba0d3318..e877eab5feccae66490112e99a7bad628174d905 100644 (file)
--- a/sys/src/9/pc/devarch.c
+++ b/sys/src/9/pc/devarch.c
@@ -188,7 +188,7 @@ ioreserve(int, int size, int align, char *tag)
        m->start = port;
        m->end = port + size;
        m->reserved = 1;
-       strncpy(m->tag, tag, sizeof(m->tag));
+       strncpy(m->tag, tag, sizeof(m->tag)-1);
        m->tag[sizeof(m->tag)-1] = 0;
        *l = m;
 
@@ -259,7 +259,7 @@ ioalloc(int port, int size, int align, char *tag)
        m->next = *l;
        m->start = port;
        m->end = port + size;
-       strncpy(m->tag, tag, sizeof(m->tag));
+       strncpy(m->tag, tag, sizeof(m->tag)-1);
        m->tag[sizeof(m->tag)-1] = 0;
        *l = m;
 
@@ -397,7 +397,7 @@ archread(Chan *c, void *a, long n, vlong offset)
                        error(Ebadarg);
                vp = a;
                for(port = offset; port < offset+n; port += 8)
-                       if(tryrdmsr(port, vp++) < 0)
+                       if(rdmsr(port, vp++) < 0)
                                error(Ebadarg);
                return n;
 
@@ -476,7 +476,7 @@ archwrite(Chan *c, void *a, long n, vlong offset)
                        error(Ebadarg);
                vp = a;
                for(port = offset; port < offset+n; port += 8)
-                       if(trywrmsr(port, *vp++) < 0)
+                       if(wrmsr(port, *vp++) < 0)
                                error(Ebadarg);
                return n;