From: Michael Buesch <mb@bu3sch.de>
Date: Fri, 24 Sep 2010 18:05:26 +0000 (+0200)
Subject: asm/dasm: Minor fixes
X-Git-Tag: b43-fwcutter-014~8
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=9f32ca3e0813a9a173636cb24152b3aed72a8859;p=b43-tools.git

asm/dasm: Minor fixes

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

diff --git a/assembler/Makefile b/assembler/Makefile
index 6bc3321..76c4852 100644
--- 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 28b6e37..eb87899 100755
--- 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 9a1ad2d..8a07f85 100755
--- 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)