Rename bcm43xx -> b43

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

diff --git a/assembler/Makefile b/assembler/Makefile
index b9c3e6648e58cf951b905eed30f7a8f01094c151..73733de7ec547ec1d0532dca63fd801b118c6c8f 100644 (file)
--- a/assembler/Makefile
+++ b/assembler/Makefile
@@ -5,7 +5,7 @@ PREFIX = /usr/local
 CFLAGS = -std=c99 -O2 -fomit-frame-pointer -Wall -D_BSD_SOURCE -D_GNU_SOURCE
 LDFLAGS = -lfl
 
-BINARY = bcm43xx-asm.bin
+BINARY = b43-asm.bin
 OBJECTS = parser.o scanner.o main.o initvals.o util.o args.o
 
 # YACC related CFLAGS
@@ -38,10 +38,10 @@ $(BINARY): $(OBJECTS)
 
 install: all
        -install -o 0 -g 0 -m 755 $(BINARY) $(PREFIX)/bin/
-       -cp bcm43xx-asm bcm43xx-asm.inst
-       -sed -i -e 's/installed=0/installed=1/' bcm43xx-asm.inst
-       -install -o 0 -g 0 -m 755 bcm43xx-asm.inst $(PREFIX)/bin/bcm43xx-asm
-       -rm -f bcm43xx-asm.inst
+       -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
+       -rm -f b43-asm.inst
 
 clean:
        -rm -f *~ *.o *.orig *.rej $(BINARY) scanner.c scanner.h parser.c parser.h

diff --git a/assembler/b43-asm b/assembler/b43-asm
new file mode 100755 (executable)
index 0000000..ec6fa6e
--- /dev/null
+++ b/assembler/b43-asm
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+installed=0
+
+if [ -z "$B43_ASM" ]; then
+       if [ $installed -eq 0 ] && [ -x "./b43-asm.bin" ]; then
+               B43_ASM="./b43-asm.bin"
+       else
+               B43_ASM="b43-asm.bin"
+       fi
+fi
+
+if [ -z "$CPP" ]; then
+       CPP="cpp"
+fi
+
+if [ $# -lt 2 ]; then
+       $B43_ASM --help
+       exit 1
+fi
+
+infile="$1"
+shift
+outfile="$1"
+shift
+
+cat "$infile" | $CPP -traditional-cpp | $B43_ASM "-" "$outfile" $@

diff --git a/assembler/bcm43xx-asm b/assembler/bcm43xx-asm
deleted file mode 100755 (executable)
index de730c7..0000000
--- a/assembler/bcm43xx-asm
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-installed=0
-
-if [ -z "$BCM43xx_ASM" ]; then
-       if [ $installed -eq 0 ] && [ -x "./bcm43xx-asm.bin" ]; then
-               BCM43xx_ASM="./bcm43xx-asm.bin"
-       else
-               BCM43xx_ASM="bcm43xx-asm.bin"
-       fi
-fi
-
-if [ -z "$CPP" ]; then
-       CPP="cpp"
-fi
-
-if [ $# -lt 2 ]; then
-       $BCM43xx_ASM --help
-       exit 1
-fi
-
-infile="$1"
-shift
-outfile="$1"
-shift
-
-cat "$infile" | $CPP -traditional-cpp | $BCM43xx_ASM "-" "$outfile" $@

diff --git a/disassembler/Makefile b/disassembler/Makefile
index c58e3f92952fd7edd78674c71da5d1c3b382c099..39392222dceb0f2f6d69700814e7f77a265222e5 100644 (file)
--- a/disassembler/Makefile
+++ b/disassembler/Makefile
@@ -3,7 +3,7 @@ PREFIX = /usr/local
 CFLAGS = -std=gnu99 -O2 -fomit-frame-pointer -Wall -D_BSD_SOURCE -D_GNU_SOURCE
 LDFLAGS =
 
-BINARY = bcm43xx-dasm.bin
+BINARY = b43-dasm.bin
 OBJECTS = main.o util.o
 
 all: $(BINARY)
@@ -17,10 +17,10 @@ $(BINARY): $(OBJECTS)
 
 install: all
        -install -o 0 -g 0 -m 755 $(BINARY) $(PREFIX)/bin/
-       -cp bcm43xx-dasm bcm43xx-dasm.inst
-       -sed -i -e 's/installed=0/installed=1/' bcm43xx-dasm.inst
-       -install -o 0 -g 0 -m 755 bcm43xx-dasm.inst $(PREFIX)/bin/bcm43xx-dasm
-       -rm -f bcm43xx-dasm.inst
+       -cp b43-dasm b43-dasm.inst
+       -sed -i -e 's/installed=0/installed=1/' b43-dasm.inst
+       -install -o 0 -g 0 -m 755 b43-dasm.inst $(PREFIX)/bin/b43-dasm
+       -rm -f b43-dasm.inst
 
 clean:
        -rm -f *~ *.o *.orig *.rej $(BINARY)

diff --git a/disassembler/b43-dasm b/disassembler/b43-dasm
new file mode 100755 (executable)
index 0000000..be48c71
--- /dev/null
+++ b/disassembler/b43-dasm
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+installed=0
+
+if [ $# -ne 2 ]; then
+       echo "Usage: $0 input_file.fw output_file.asm"
+       exit 1
+fi
+
+if [ -z "$B43_DASM" ]; then
+       if [ $installed -eq 0 ] && [ -x "./b43-dasm.bin" ]; then
+               B43_DASM="./b43-dasm.bin"
+       else
+               B43_DASM="b43-dasm.bin"
+       fi
+fi
+
+infile="$1"
+outfile="$2"
+
+cat "$infile" | $B43_DASM "$outfile"
+

diff --git a/disassembler/bcm43xx-dasm b/disassembler/bcm43xx-dasm
deleted file mode 100755 (executable)
index aad3321..0000000
--- a/disassembler/bcm43xx-dasm
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-installed=0
-
-if [ $# -ne 2 ]; then
-       echo "Usage: $0 input_file.fw output_file.asm"
-       exit 1
-fi
-
-if [ -z "$BCM43xx_DASM" ]; then
-       if [ $installed -eq 0 ] && [ -x "./bcm43xx-dasm.bin" ]; then
-               BCM43xx_DASM="./bcm43xx-dasm.bin"
-       else
-               BCM43xx_DASM="bcm43xx-dasm.bin"
-       fi
-fi
-
-infile="$1"
-outfile="$2"
-
-cat "$infile" | $BCM43xx_DASM "$outfile"
-