c64/pi1541
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Made changes to differentiate between Raspberry Pi 1 Mobel B Rev 1 (GPIO 0/1) and Rev 2 (GPIO 2/3) pins

Browse source
This commit is contained in:
James Johnston 2020-04-15 19:34:04 -05:00
parent 4cf352d70e
commit 3985221eb0
5 changed files with 36 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.travis.yml
View file

@ -11,8 +11,9 @@ addons:
matrix: matrix:
include: include:
- env: RASPPI=0 - env: RASPPI=0
- env: RASPPI=1 - env: RASPPI=1Br1
- env: RASPPI=1Plus - env: RASPPI=1Br2
- env: RASPPI=1BPlus
- env: RASPPI=2 - env: RASPPI=2
- env: RASPPI=3 - env: RASPPI=3

34
Makefile.rules
View file

@ -3,8 +3,9 @@ ifneq ($(V),1)
Q := @ Q := @
endif endif
#use RASPPI = 1 Raspberry 1B (26 IOports) #use RASPPI = 1Br1 Raspberry Pi 1B Rev 1 (26 IOports) (GPIO0/1)
#use RASPPI = 1Plus to Raspberry 1B+ (40 I/OPorts) #use RASPPI = 1Br2 Raspberry Pi 1B Rev 2 (26 IOports) (GPIO2/3)
#use RASPPI = 1BPlus to Raspberry Pi 1B+ (40 I/OPorts)
RASPPI ?= 3 RASPPI ?= 3
PREFIX ?= arm-none-eabi- PREFIX ?= arm-none-eabi-
@ -16,22 +17,25 @@ LD = $(PREFIX)ld
AR = $(PREFIX)ar AR = $(PREFIX)ar
ifeq ($(strip $(RASPPI)),0) ifeq ($(strip $(RASPPI)),0)
ARCH ?= -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -DRPIZERO=1 -DEXPERIMENTALZERO=1 ARCH ?= -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -DRPIZERO=1 -DEXPERIMENTALZERO=1
CFLAGS += -DRPIZERO=1 -DRASPPI=1 CFLAGS += -DRPIZERO=1 -DRASPPI=1
else ifeq ($(strip $(RASPPI)),1) else ifeq ($(strip $(RASPPI)),1Br1)
ARCH ?= -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -DEXPERIMENTALZERO=1 ARCH ?= -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -DRPI1BR1 -DEXPERIMENTALZERO=1
CFLAGS += -DRASPPI=1 CFLAGS += -DRPI1BR1 -DRASPPI=1
else ifeq ($(strip $(RASPPI)),1Plus) else ifeq ($(strip $(RASPPI)),1Br2)
ARCH ?= -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -DRPIBPLUS=1 -DEXPERIMENTALZERO=1 ARCH ?= -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -DRPI1BR2 -DEXPERIMENTALZERO=1
CFLAGS += -DRPIBPLUS=1 -DRASPPI=1 CFLAGS += -DRPI1BR2 -DRASPPI=1
else ifeq ($(strip $(RASPPI)),1BPlus)
ARCH ?= -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -DRPIBPLUS=1 -DEXPERIMENTALZERO=1
CFLAGS += -DRPIBPLUS=1 -DRASPPI=1
else ifeq ($(strip $(RASPPI)),2) else ifeq ($(strip $(RASPPI)),2)
ARCH ?= -march=armv7-a -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -marm -DRPI2=1 -DEXPERIMENTALZERO=1 ARCH ?= -march=armv7-a -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -marm -DRPI2=1 -DEXPERIMENTALZERO=1
CFLAGS += -DRPI2=1 CFLAGS += -DRPI2=1
else ifeq ($(strip $(RASPPI)),3) else ifeq ($(strip $(RASPPI)),3)
ARCH ?= -march=armv8-a+crc -mtune=cortex-a53 -mfpu=crypto-neon-fp-armv8 -mfloat-abi=hard -marm -DRPI3=1 ARCH ?= -march=armv8-a+crc -mtune=cortex-a53 -mfpu=crypto-neon-fp-armv8 -mfloat-abi=hard -marm -DRPI3=1
CFLAGS += -DRPI3=1 CFLAGS += -DRPI3=1
else else
$(error RASPPI must be one of: 0, 1, 1Plus, 2, 3) $(error RASPPI must be one of: 0, 1Br1, 1Br2, 1BPlus, 2, 3)
endif endif
AFLAGS += $(ARCH) AFLAGS += $(ARCH)

11
src/iec_bus.h
View file

@ -118,16 +118,21 @@ enum PIGPIO
PIGPIO_IN_BUTTON1 = 27 // 13 Common PIGPIO_IN_BUTTON1 = 27 // 13 Common
}; };
#else #else
//Added GPIO bindings for Raspberry 1B (only 26 I/O ports) //Added GPIO bindings for Raspberry Pi 1B Rev 1/2 (only 26 I/O ports)
enum PIGPIO enum PIGPIO
{ {
// Original Non-split lines // Original Non-split lines
// Raspberry Pi 1B Rev 2 has GPIO0/1 in place of GPIO2/3
#if defined(RPI1BR1)
PIGPIO_ATN = 0, // 3
PIGPIO_RESET = 1, // 5
#else
PIGPIO_ATN = 2, // 3 PIGPIO_ATN = 2, // 3
PIGPIO_RESET = 3, // 5
#endif
PIGPIO_DATA = 18, // 12 PIGPIO_DATA = 18, // 12
PIGPIO_CLOCK = 17, // 11 PIGPIO_CLOCK = 17, // 11
PIGPIO_SRQ = 19, // 35 not connected yet PIGPIO_SRQ = 19, // 35 not connected yet
PIGPIO_RESET = 3, // 5
// Pinout for those that want to split the lines (and the common ones like buttons, sound and LED) // Pinout for those that want to split the lines (and the common ones like buttons, sound and LED)
// Funktion = GPIO // Hardware PIN // Funktion = GPIO // Hardware PIN

2
src/rpi-gpio.h
View file

@ -37,7 +37,7 @@
//#define GPSET1 (RPI_GPIO_BASE + 0x20) //#define GPSET1 (RPI_GPIO_BASE + 0x20)
//#define GPCLR1 (RPI_GPIO_BASE + 0x2c) //#define GPCLR1 (RPI_GPIO_BASE + 0x2c)
#if defined(RPIZERO) || defined(RPIBPLUS) || defined(RPI2) || defined(RPI3) #if defined(RPIZERO) || defined(RPI1BPLUS) || defined(RPI2) || defined(RPI3)
#define LED_GPIO_BIT 15 #define LED_GPIO_BIT 15
#define LED_ON() do { RPI_GpioBase->GPCLR0[1] = (1 << LED_GPIO_BIT); } while(0) #define LED_ON() do { RPI_GpioBase->GPCLR0[1] = (1 << LED_GPIO_BIT); } while(0)
#define LED_OFF() do { RPI_GpioBase->GPSET0[1] = (1 << LED_GPIO_BIT); } while(0) #define LED_OFF() do { RPI_GpioBase->GPSET0[1] = (1 << LED_GPIO_BIT); } while(0)