Updates allowing to improve building on linux.

.gitignore

@@ -36,3 +36,5 @@ WINBUILD-nibread/objfre*
 /obj*
 /objchk*
 /objfre*
+*.o
+*~

GNU/Makefile

@@ -47,30 +47,35 @@ dos:
 		CFLAGS="-I include/DOS/ $(CFLAGS)" \
 		EXE=".exe" \
 		-f GNU/Makefile \
-		nibread nibwrite nibconv nibscan nibrepair
+		nibconv nibscan nibrepair nibread nibwrite
 
 linux:
-	${MAKE} CFLAGS="-I include/LINUX/ -I ${CBM_LNX_PATH}/include ${CFLAGS}  -std=c99" \
+	${MAKE} CFLAGS="-I include/LINUX/ -I ${CBM_LNX_PATH}/include ${CFLAGS}  -std=c99 -D_BSD_SOURCE" \
 		LDFLAGS="-L${CBM_LNX_PATH}/lib -lopencbm" \
 		-f GNU/Makefile \
-		nibread nibwrite nibconv nibscan nibrepair nibsrqtest
+		nibconv nibscan nibrepair nibread nibwrite nibsrqtest
 
 win32:
 	${MAKE} CFLAGS="-I include/WINDOWS/ -I ${CBM_WIN_PATH}/include -D WIN32 ${CFLAGS} -std=c99" \
 		LDFLAGS="-L${CBM_WIN_PATH}/bin/i386/ -lopencbm" \
 		EXE=".exe" \
 		-f GNU/Makefile \
-		nibread nibwrite nibconv nibscan nibrepair nibsrqtest
+		nibconv nibscan nibrepair nibread nibwrite nibsrqtest
 
 win64:
 	${MAKE} CFLAGS="-I include/WINDOWS/ -I ${CBM_WIN_PATH}/include -D WIN32 ${CFLAGS} -std=c99" \
 		LDFLAGS="-L${CBM_WIN_PATH}/bin/amd64/ -lopencbm" \
 		EXE=".exe" \
 		-f GNU/Makefile \
-		nibread nibwrite nibconv nibscan nibrepair nibsrqtest
+		nibconv nibscan nibrepair nibread nibwrite nibsrqtest
 
 # Warning level.  Don't reduce, fix your new code instead.
-WARNS= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wpointer-arith 
+WARNS= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wpointer-arith \
+       -Wextra -Wconversion -pedantic \
+       -Werror-implicit-function-declaration \
+       -Wsign-conversion
+#       -Werror=format-security
+
 
 # Common objects
 OBJ=gcr.o prot.o fileio.o crc.o md5.o lz.o
@@ -89,7 +94,7 @@ buildall: ${PROG}
 
 nibread: ${OBJ} ${NIBREAD_OBJ} ${NIBTOOLS_BIN} ${ARCH_OBJ}
 	${CC} -o nibread$(EXE) ${OBJ} ${NIBREAD_OBJ} ${ARCH_OBJ} ${LDFLAGS}
-	
+
 nibsrqtest: ${NIBSRQTEST_OBJ} ${NIBTOOLS_BIN} ${ARCH_OBJ}
 	${CC} -o nibsrqtest$(EXE) ${NIBSRQTEST_OBJ} ${ARCH_OBJ} ${LDFLAGS}
 
@@ -103,20 +108,20 @@ nibsrqtest.c: ${NIBTOOLS_BIN}
 nibwrite.c: ${NIBTOOLS_BIN} 
 
 nibconv: ${OBJ} nibconv.o
-	${CC} -o nibconv$(EXE) nibconv.o ${OBJ} $(LDFLAGS)
+	${CC} -o nibconv$(EXE) nibconv.o ${OBJ}
 
 nibrepair: ${OBJ} nibrepair.o
-	${CC} -o nibrepair$(EXE) nibrepair.o ${OBJ} $(LDFLAGS)
+	${CC} -o nibrepair$(EXE) nibrepair.o ${OBJ}
 
 nibscan: ${OBJ} nibscan.o
-	${CC} -o nibscan$(EXE) nibscan.o ${OBJ} $(LDFLAGS)
+	${CC} -o nibscan$(EXE) nibscan.o ${OBJ}
 
 clean:
 	${RM} *.o ${MNIB_BIN} *.bin *.inc nib*.exe
 
 distclean: clean
 	${RM} ${PROG} *.exe
-	
+
 drive.o: nibtools_1541.inc nibtools_1541_ihs.inc nibtools_1571.inc nibtools_1571_ihs.inc nibtools_1571_srq.inc nibtools_1571_srq_test.inc
 
 *.o: gcr.h nibtools.h
@@ -136,15 +141,15 @@ nibtools_1541_ihs.bin: nibtools_15x1_ihs.asm
 nibtools_1571_ihs.bin: nibtools_15x1_ihs.asm
 	$(CA65) $(CA65_FLAGS) -D DRIVE=1571 -o $*.tmp $<
 	$(LD65) -o $@ --target none $*.tmp && rm -f $*.tmp
-	
+
 nibtools_1571_srq.bin: nibtools_1571_srq.asm
 	$(CA65) $(CA65_FLAGS) -D DRIVE=1571 -o $*.tmp $<
 	$(LD65) -o $@ --target none $*.tmp && rm -f $*.tmp
 
 nibtools_1571_srq_test.bin: nibtools_1571_srq_test.asm
 	$(CA65) $(CA65_FLAGS) -D DRIVE=1571 -o $*.tmp $<
 	$(LD65) -o $@ --target none $*.tmp && rm -f $*.tmp
-	
+
 .bin.inc:
 	test -s $< && od -txC -v -An $< | \
 	sed 's/\([0-9a-f]\{2\}\) */0x\1,/g; $$s/,$$//' > $@

LINUX/Makefile

@@ -1,20 +1,22 @@
 # $Id: Makefile,v 1.1.1.1 2007/01/21 17:15:35 peter Exp $
 
-RELATIVEPATH=../
-include ${RELATIVEPATH}LINUX/config.make
+#RELATIVEPATH=../
+#include ${RELATIVEPATH}LINUX/config.make
 
 .PHONY: all mrproper clean install uninstall install-files
 
 OBJS =  nibread.o nibwrite.o nibscan.o nibconv.o nibrepair.o nibsrqtest.o read.o write.o gcr.o prot.o crc.o drive.o fileio.o ihs.o lz.o md5.o 
 PROG = nibread nibwrite nibscan nibconv nibrepair nibsrqtest
 
+CBM_LNX_PATH=../../../opencbm/OpenCBM/opencbm
+
 all:
-	make -f GNU/Makefile CBM_LNX_PATH="../" linux
+	make -f GNU/Makefile CBM_LNX_PATH=$(CBM_LNX_PATH) linux
 
 mrproper: clean
 
 clean:
-	make -f GNU/Makefile CBM_LNX_PATH="../" distclean
+	make -f GNU/Makefile distclean
 
 install-files: $(PROG)
 	install -m 755 -s $(PROG) $(BINDIR)

Makefile

@@ -0,0 +1,18 @@
+
+#TARGET_ENV=GNU
+TARGET_ENV=LINUX
+#TARGET_ENV=WSDK
+
+all:
+	make -f $(TARGET_ENV)/Makefile
+
+clean:
+	make -f $(TARGET_ENV)/Makefile clean
+
+install:
+	make -f $(TARGET_ENV)/Makefile install
+
+uninstall:
+	make -f $(TARGET_ENV)/Makefile uninstall
+
+.PHONY: all clean install uninstall

drive.c

@@ -8,6 +8,10 @@
 #include <time.h>
 #include <signal.h>
 
+#ifndef DJGPP
+#include <opencbm.h>
+#endif
+
 #include "mnibarch.h"
 #include "gcr.h"
 #include "nibtools.h"

drive.h

@@ -0,0 +1,34 @@
+
+#ifndef DRIVE_H
+#define DRIVE_H
+
+int compare_extension(unsigned char * filename, unsigned char * extension);
+unsigned char  burst_read(CBM_FILE f);
+void burst_write(CBM_FILE f, unsigned char c);
+int burst_read_n(CBM_FILE f, unsigned char *Buffer, unsigned int Length);
+int burst_write_n(CBM_FILE f, unsigned char *Buffer, unsigned int Length);
+int burst_read_track(CBM_FILE f, unsigned char *Buffer, unsigned int Length);
+int burst_write_track(CBM_FILE f, unsigned char *Buffer, unsigned int Length);
+void ARCH_SIGNALDECL handle_signals(int sig);
+void ARCH_SIGNALDECL handle_exit(void);
+int upload_code(CBM_FILE fd, BYTE drive);
+int reset_floppy(CBM_FILE fd, BYTE drive);
+int init_floppy(CBM_FILE fd, BYTE drive, int bump);
+int set_density(CBM_FILE fd, BYTE density);
+BYTE set_bitrate(CBM_FILE fd, BYTE density);
+BYTE set_default_bitrate(CBM_FILE fd, int track);
+BYTE scan_track(CBM_FILE fd, int track);
+void perform_bump(CBM_FILE fd, BYTE drive);
+int test_par_port(CBM_FILE fd);
+void send_mnib_cmd(CBM_FILE fd, BYTE cmd, BYTE *args, int num_args);
+void set_full_track(CBM_FILE fd);
+void motor_on(CBM_FILE fd);
+void motor_off(CBM_FILE fd);
+void step_to_halftrack(CBM_FILE fd, int halftrack);
+int verify_floppy(CBM_FILE fd);
+#ifdef DJGPP
+#include <unistd.h>
+int find_par_port(CBM_FILE fd);
+#endif
+
+#endif

fileio.h

@@ -0,0 +1,25 @@
+
+#ifndef FILEIO_H
+#define FILEIO_H
+
+void parseargs(char *argv[]);
+void switchusage(void);
+int load_file(char *filename, BYTE *file_buffer);
+int save_file(char *filename, BYTE *file_buffer, int length);
+int read_nib(BYTE *file_buffer, int file_buffer_size, BYTE *track_buffer, BYTE *track_density, size_t *track_length);
+int read_nb2(char *filename, BYTE *track_buffer, BYTE *track_density, size_t *track_length);
+int read_g64(char *filename, BYTE *track_buffer, BYTE *track_density, size_t *track_length);
+int read_d64(char *filename, BYTE *track_buffer, BYTE *track_density, size_t *track_length);
+int write_nib(BYTE*file_buffer, BYTE *track_buffer, BYTE *track_density, size_t *track_length);
+int write_g64(char *filename, BYTE *track_buffer, BYTE *track_density, size_t *track_length);
+int write_d64(char *filename, BYTE *track_buffer, BYTE *track_density, size_t *track_length);
+size_t compress_halftrack(int halftrack, BYTE *track_buffer, BYTE track_density, size_t track_length);
+int align_tracks(BYTE *track_buffer, BYTE *track_density, size_t *track_length, BYTE *track_alignment);
+int sync_tracks(BYTE *track_buffer, BYTE *track_density, size_t *track_length, BYTE *track_alignment);
+int write_dword(FILE * fd, DWORD * buf, int num);
+unsigned int crc_dir_track(BYTE *track_buffer, size_t *track_length);
+unsigned int crc_all_tracks(BYTE *track_buffer, size_t *track_length);
+unsigned int md5_dir_track(BYTE *track_buffer, size_t *track_length, unsigned char *result);
+unsigned int md5_all_tracks(BYTE *track_buffer, size_t *track_length, unsigned char *result);
+
+#endif

include/LINUX/mnibarch.h

@@ -1,4 +1,8 @@
-#include <opencbm.h>
+
+#ifndef MNIBARCH_H
+#define MNIBARCH_H
+
+#include <stdint.h>
 #include <unistd.h>
 
 #define delay(x)  usleep((x) * 1000)
@@ -12,6 +16,12 @@ typedef unsigned char BYTE;
 // __int32 and min() are needed for bitshifter.c (included by fileio.c)
 typedef int32_t __int32;
 
+#ifndef CBM_FILE
+typedef int CBM_FILE;
+#endif
+
 #ifndef min
 #define min(x, y) ((x) > (y) ? (y) : (x))
 #endif
+
+#endif

nibconv.c

@@ -12,10 +12,14 @@
 
 #include "mnibarch.h"
 #include "gcr.h"
-#include "nibtools.h"
+#include "drive.h"
+#include "fileio.h"
 #include "lz.h"
+#include "nibtools_version.h"
 #include "prot.h"
 
+void usage(void);
+
 int _dowildcard = 1;
 
 BYTE compressed_buffer[(MAX_HALFTRACKS_1541 + 2) * NIB_TRACK_LENGTH];

nibread.c

@@ -11,6 +11,10 @@
 #include <time.h>
 #include <ctype.h>
 
+#ifndef DJGPP
+#include <opencbm.h>
+#endif
+
 #include "mnibarch.h"
 #include "gcr.h"
 #include "nibtools.h"

nibsrqtest.c

@@ -9,6 +9,10 @@
 #include <time.h>
 #include <ctype.h>
 
+#ifndef DJGPP
+#include <opencbm.h>
+#endif
+
 #include "mnibarch.h"
 #include "gcr.h"
 #include "nibtools.h"