Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---
name: CI

# yamllint disable-line rule:truthy
on:
push:
pull_request:
schedule:
- cron: "0 0 22 * *"

jobs:
build:
name: Build and test
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Fix Checkout
run: |
git fetch --force --tags

- name: Run minimal test build
run: |
make all

- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: z180emu
path: |
p112
markiv
makedisk
14 changes: 14 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

# Intermediate objects generated during compile
*.o

# Compiled output
makedisk
markiv
p112
sc126

# Binary ROMs needed for the emulators
markivrom.bin
p112rom.bin
sc126rom.bin
15 changes: 14 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,20 @@ endif

CCOPTS ?= -O3 -DSOCKETCONSOLE -std=gnu89

all: p112 markiv makedisk
CFLAGS ?= -DSOCKETCONSOLE -g
LDFLAGS ?= $(SOCKLIB)

all: sc126 p112 markiv makedisk


sc126.o: sc126.c sconsole.h z180dbg.h z180/z180.h z180/z80daisy.h z180/z80common.h ds1202_1302/ds1202_1302.h sdcard/sdcard.h
sc126: sc126.o
sc126: z180/z180.o z180/z180dasm.o z180/z80daisy.o z180/z80scc.o z180/z180asci.o
sc126: ds1202_1302/rtc_sc126.o ds1202_1302/ds1202_1302.o
sc126: sdcard/sdcard.o

ds1202_1302/rtc_sc126.o: ds1202_1302/rtc.c ds1202_1302/rtc.h
$(CC) $(CFLAGS) -Dmachine_name=\"sc126\" -DHAVE_SYS_TIME_H -DHAVE_GETTIMEOFDAY -o $@ -c $<

markiv: ide.o z180.o z180dasm.o z80daisy.o z80scc.o z180asci.o markiv.o rtc_markiv.o ds1202_1302.o
$(CC) $(CCOPTS) -s -o markiv $^ $(SOCKLIB)
Expand Down
2 changes: 1 addition & 1 deletion ds1202_1302/ds1202_1302.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#define lib_calloc calloc
#define lib_free free

int VERBOSE;
extern int VERBOSE;
#define mon_out(x) if (VERBOSE) printf x

/* The DS1202 and DS1302 are serial line based RTCs, they have the following features:
Expand Down
2 changes: 1 addition & 1 deletion fdc/86box.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#define wcscasecmp strcasecmp
#define wcslen strlen

int VERBOSE;
extern int VERBOSE;
#define LOG(...) do { if (VERBOSE) printf (__VA_ARGS__); } while (0)

char *plat_get_extension(char *s);
Expand Down
2 changes: 1 addition & 1 deletion ins8250/ins8250.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#pragma once

int VERBOSE;
extern int VERBOSE;
#include <stdio.h>
#ifndef LOG
#define LOG(...) do { if (VERBOSE) printf (__VA_ARGS__); } while (0)
Expand Down
2 changes: 1 addition & 1 deletion markiv.c
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ int main(int argc, char** argv)
atexit(destroy_rtc);

cpu = cpu_create_z180("Z180",Z180_TYPE_Z180,18432000,&ram,NULL,&iospace,irq0ackcallback,NULL/*daisychain*/,
asci_rx,asci_tx,NULL,NULL,NULL,NULL);
asci_rx,asci_tx,NULL,NULL,NULL,NULL,NULL,NULL);
//printf("1\n");fflush(stdout);
cpu_reset_z180(cpu);
//printf("2\n");fflush(stdout);
Expand Down
2 changes: 1 addition & 1 deletion p112.c
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ int main(int argc, char** argv)
fdd_load(BOOT_FDD,"p112-fdd1.img");

cpu = cpu_create_z180("Z182",Z180_TYPE_Z182,16000000,&ram,&rom,&iospace,irq0ackcallback,NULL/*daisychain*/,
NULL,NULL,escc_rx,escc_tx,parport_read,parport_write);
NULL,NULL,NULL,NULL,escc_rx,escc_tx,parport_read,parport_write);
//printf("1\n");fflush(stdout);
cpu_reset_z180(cpu);
//printf("2\n");fflush(stdout);
Expand Down
Loading