github.com/PDP-10.klh10
1
0
Fork 0
mirror of https://github.com/PDP-10/klh10.git synced 2026-02-08 09:11:59 +00:00
Code Issues Releases Wiki Activity

Change configure to control the compilation of the Panda lights.

Browse Source 
This needs to check for libusb-1.0. Since this shouldn't be linked to
the auxiliary programs, add another Makefile variable to record it in:
CPULIBS.
Stub out calls to outb() if it is unavailable, so that it can at least
use libusb in that case.
This commit is contained in:
Olaf Seibert
2018-09-15 00:04:31 +02:00
parent 129e3d0f16
commit 6a8a710ecf
4 changed files with 66 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Makefile.mk
View File

@@ -54,7 +54,8 @@ CFLAGS_LINT ?=
LINKER ?= $(CC)
LDFLAGS ?=
LDOUTF ?= -o
LIBS := -lusb-1.0
LIBS ?=
CPULIBS ?=
NETLIBS ?= -lpcap
# Variables specific to this makefile setup
@@ -108,6 +109,7 @@ showdefs:
@echo "CPPFLAGS= $(CPPFLAGS)"
@echo "LDFLAGS = $(LDFLAGS)"
@echo "LIBS = $(LIBS)"
@echo "CPULIBS = $(CPULIBS)"
@echo "NETLIBS = $(NETLIBS)"
@echo "CENVFLAGS = $(CENVFLAGS)"
@echo "CONFFLAGS = $(CONFFLAGS)"
@@ -252,13 +254,13 @@ DINTFLAGS = \
##
kn10-ks: $(OFILES_KS)
$(LINKER) $(LDFLAGS) $(LDOUTF) kn10-ks $(OFILES_KS) $(LIBS)
$(LINKER) $(LDFLAGS) $(LDOUTF) kn10-ks $(OFILES_KS) $(LIBS) $(CPULIBS)
kn10-ks-its: $(OFILES_KS)
$(LINKER) $(LDFLAGS) $(LDOUTF) kn10-ks-its $(OFILES_KS) $(LIBS)
$(LINKER) $(LDFLAGS) $(LDOUTF) kn10-ks-its $(OFILES_KS) $(LIBS) $(CPULIBS)
kn10-kl: $(OFILES_KL)
$(LINKER) $(LDFLAGS) $(LDOUTF) kn10-kl $(OFILES_KL) $(LIBS)
$(LINKER) $(LDFLAGS) $(LDOUTF) kn10-kl $(OFILES_KL) $(LIBS) $(CPULIBS)
####################################################################
@@ -325,6 +327,7 @@ base-ks-its:
"CPPFLAGS = $(CPPFLAGS)" \
"LDFLAGS = $(LDFLAGS)" \
"LIBS = $(LIBS)" \
"CPULIBS = $(CPULIBS)" \
"NETLIBS = $(NETLIBS)" \
"CENVFLAGS = $(CENVFLAGS)" \
"CONFFLAGS = \
@@ -355,6 +358,7 @@ base-ks:
"CPPFLAGS = $(CPPFLAGS)" \
"LDFLAGS = $(LDFLAGS)" \
"LIBS = $(LIBS)" \
"CPULIBS = $(CPULIBS)" \
"NETLIBS = $(NETLIBS)" \
"CENVFLAGS = $(CENVFLAGS)" \
"CONFFLAGS = \
@@ -381,6 +385,7 @@ base-kl:
"CPPFLAGS = $(CPPFLAGS)" \
"LDFLAGS = $(LDFLAGS)" \
"LIBS = $(LIBS)" \
"CPULIBS = $(CPULIBS)" \
"NETLIBS = $(NETLIBS)" \
"CENVFLAGS = $(CENVFLAGS)" \
"CONFFLAGS = \
@@ -434,6 +439,7 @@ lint-ks-its:
"CPPFLAGS = $(CPPFLAGS)" \
"LDFLAGS = $(LDFLAGS)" \
"LIBS = $(LIBS)" \
"CPULIBS = $(CPULIBS)" \
"NETLIBS = $(NETLIBS)" \
"CENVFLAGS = $(CENVFLAGS)" \
"CONFFLAGS = $(CONFFLAGS) $(CONFFLAGS_AUX) $(CONFFLAGS_USR)"
@@ -446,6 +452,7 @@ lint-ks:
"CPPFLAGS = $(CPPFLAGS)" \
"LDFLAGS = $(LDFLAGS)" \
"LIBS = $(LIBS)" \
"CPULIBS = $(CPULIBS)" \
"NETLIBS = $(NETLIBS)" \
"CENVFLAGS = $(CENVFLAGS)" \
"CONFFLAGS = $(CONFFLAGS) $(CONFFLAGS_AUX) $(CONFFLAGS_USR)"
@@ -458,6 +465,7 @@ lint-kl:
"CPPFLAGS = $(CPPFLAGS)" \
"LDFLAGS = $(LDFLAGS)" \
"LIBS = $(LIBS)" \
"CPULIBS = $(CPULIBS)" \
"NETLIBS = $(NETLIBS)" \
"CENVFLAGS = $(CENVFLAGS)" \
"CONFFLAGS = $(CONFFLAGS) $(CONFFLAGS_AUX) $(CONFFLAGS_USR)"
@@ -480,6 +488,7 @@ port-ks:
"CPPFLAGS = $(CPPFLAGS)" \
"LDFLAGS = $(LDFLAGS)" \
"LIBS = $(LIBS)" \
"CPULIBS = $(CPULIBS)" \
"NETLIBS = $(NETLIBS)" \
"CENVFLAGS = $(CENVFLAGS)" \
"CONFFLAGS = \
@@ -507,6 +516,7 @@ kl0i-sync:
"CPPFLAGS = $(CPPFLAGS)" \
"LDFLAGS = $(LDFLAGS)" \
"LIBS = $(LIBS)" \
"CPULIBS = $(CPULIBS)" \
"NETLIBS = $(NETLIBS)" \
"CENVFLAGS = $(CENVFLAGS)" \
"CONFFLAGS = \
@@ -533,6 +543,7 @@ kl0i-rtmopt:
"CPPFLAGS = $(CPPFLAGS)" \
"LDFLAGS = $(LDFLAGS)" \
"LIBS = $(LIBS)" \
"CPULIBS = $(CPULIBS)" \
"NETLIBS = $(NETLIBS)" \
"CENVFLAGS = $(CENVFLAGS)" \
"CONFFLAGS = \

11
src/dvlites.c
View File

@@ -33,8 +33,19 @@ static int decosfcclossage;
#if KLH10_DEV_LITES /* Moby conditional for entire file */
#if HAVE_LIBUSB_1_0
#include <libusb-1.0/libusb.h>
#endif
/*
* For now, assume that having <sys/io.h> is equivalent to having
* outb(). That may not be exactly true but it's the code we have.
*/
#ifdef HAVE_SYS_IO_H
#include <sys/io.h>
#else
static inline int ioperm(int a, int b, int c) { return -1; }
static inline void outb(int a, int b) {}
#endif
#include "dvlites.h"