diff --git a/Makefile b/Makefile
old mode 100755
new mode 100644
index 46c815b..a164da0
--- a/Makefile
+++ b/Makefile
@@ -19,13 +19,14 @@ VPATH = accessories: \
usrp:
LDFLAGS = -lpthread -lusrp -m32
-CFLAGS = -O2 -D_FORTIFY_SOURCE=0 -g3 $(CINCPATHFLAGS)
+CFLAGS = -O2 -D_FORTIFY_SOURCE=0 -g3 -m32 $(CINCPATHFLAGS)
ASMFLAGS = -masm=intel
SKIP = %main.cpp %simd-test.cpp %fft-test.cpp %acq-test.cpp %sse_new.cpp %gps-usrp.cpp
SRCC = $(wildcard main/*.cpp simd/*.cpp accessories/*.cpp acquisition/*.cpp objects/*.cpp usrp/*.cpp)
SRC = $(filter-out $(SKIP), $(SRCC))
OBJS = $(SRC:.cpp=.o)
+OBJS += usrp/gn3s_firmware.o
HEADERS = $(wildcard accessories/*.h acquisition/*.h main/*.h objects/*.h simd/*.h includes/*.h)
#Uncomment these to look at the disassembly
@@ -60,6 +61,9 @@ simd-test: simd-test.o $(OBJS)
%.o:%.s
$(ASM) $(CFLAGS) -c $< -o $@
+%.o:%.ihx
+ ld -r -b binary $< -o $@
+
gps-gse:
make --directory=./gse
diff --git a/accessories/misc.cpp b/accessories/misc.cpp
index e1e9241..2747fe7 100644
--- a/accessories/misc.cpp
+++ b/accessories/misc.cpp
@@ -269,15 +269,16 @@ int32 run_agc(CPX *_buff, int32 _samps, int32 bits, int32 scale)
/* Get rid of the divide, replace with a multiply to scale to 2^15, then right shift to get
* back into AGC_BITS of magnitude */
- lscale = (1 << 14) / scale;
- shift = 14 - bits;
+// lscale = (1 << 14) / scale;
+// shift = 14 - bits;
max = 1 << bits;
num = 0;
- x86_muls((int16 *)_buff, &lscale, 2*_samps, shift);
+// x86_muls((int16 *)_buff, &lscale, 2*_samps, shift);
for(lcv = 0; lcv < 2*_samps; lcv++)
{
+ p[lcv] >>= 7;
if(abs(p[lcv]) > max)
num++;
}
diff --git a/gse/gui.fbp b/gse/gui.fbp
index ae303b1..777b1e5 100644
--- a/gse/gui.fbp
+++ b/gse/gui.fbp
@@ -1040,7 +1040,7 @@
iGUI_PVT
- 1000,600
+ 1600,600
wxDEFAULT_FRAME_STYLE
PVT
@@ -1149,7 +1149,7 @@
5
wxEXPAND
5
-