asm/dasm: Minor fixes

Signed-off-by: Michael Buesch <mb@bu3sch.de>

diff --git a/assembler/Makefile b/assembler/Makefile
index 6bc332195dfd9bbd2c0cafced8177c3ba7f34192..76c4852e9275b37f3678d826692672100ab60fec 100644 (file)
--- a/assembler/Makefile
+++ b/assembler/Makefile
@@ -70,10 +70,10 @@ $(BIN): $(call OBJS,$(SRCS))
        $(QUIET_CC) $(CFLAGS) -o $(BIN) $(call OBJS,$(SRCS)) $(LDFLAGS)
 
 install: all
-       install -o 0 -g 0 -m 755 $(BIN) $(PREFIX)/bin/
+       install -m 755 $(BIN) $(PREFIX)/bin/
        cp b43-asm b43-asm.inst
        sed -i -e 's/installed=0/installed=1/' b43-asm.inst
-       install -o 0 -g 0 -m 755 b43-asm.inst $(PREFIX)/bin/b43-asm
+       install -m 755 b43-asm.inst $(PREFIX)/bin/b43-asm
        rm -f b43-asm.inst
 
 clean:

diff --git a/disassembler/b43-ivaldump b/disassembler/b43-ivaldump
index 28b6e37de11272fd5ab4131f547cb5da5794d5d5..eb87899bb949f3bfcfe496e51f92d60421ea77aa 100755 (executable)
--- a/disassembler/b43-ivaldump
+++ b/disassembler/b43-ivaldump
@@ -75,4 +75,4 @@ while idx < len(ivals):
                data = ord(ivals[idx + 2]) << 8
                data |= ord(ivals[idx + 3]) << 0
                idx += 4
-               print "\tmmio16\t0x%08X, 0x%04X" % (data, offset)
+               print "\tmmio16\t0x%04X, 0x%04X" % (data, offset)

diff --git a/disassembler/brcm80211-ivaldump b/disassembler/brcm80211-ivaldump
index 9a1ad2d7be5d03634ddf67df99b1a7807e4232a2..8a07f8577541aacd6d81b47e97276f324bdc73ce 100755 (executable)
--- a/disassembler/brcm80211-ivaldump
+++ b/disassembler/brcm80211-ivaldump
@@ -64,7 +64,10 @@ for idx in range(0, len(ivals), 8):
        if size == 4:
                print "\tmmio32\t0x%08X, 0x%04X" % (value, addr)
        elif size == 2:
-               print "\tmmio16\t0x%08X, 0x%04X" % (value, addr)
+               if value & 0xFFFF0000:
+                       print "The input file is malformed (invalid value for 16bit field)"
+                       sys.exit(1)
+               print "\tmmio16\t0x%04X, 0x%04X" % (value, addr)
        else:
                print "The input file is malformed (invalid size field: 0x%04X)" % size
                sys.exit(1)