Skip to content

Commit

Permalink
Fix make distcheck, prepare for 0.2.2 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
spth committed Sep 25, 2020
1 parent 5153f7b commit 927b08a
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
????-??-?? v0.2.2
2020-09-25 v0.2.2
Improve support for Dynamic C 9 pilot.bin, replace command-line option for Dynamic C 8 pilot.bin format by autodetection. Add --verbose option to control verbosity.

2020-09-20 v0.2.1
Expand Down
7 changes: 4 additions & 3 deletions coldboot/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
data_DATA = coldload.bin
dist_data_DATA = pilot.bin
noinst_PROGRAMS = makecold

makecold_SOURCES = makecold.cpp

EXTRA_DIST = coldload.s

MOSTLYCLEANFILES = *.rel *.lk *.noi *.map *.ihx coldload.no3.bin
MOSTLYCLEANFILES = *.rel *.lk *.noi *.map *.ihx coldload.no3.bin coldload.bin

coldload.bin: coldload.no3.bin makecold
rm -f coldload.bin
Expand All @@ -21,6 +22,6 @@ coldload.rel: coldload.s
$(ASRAB) -o $@ $<

# TODO: Modify pilot.c to make it actually compileable with SDCC
pilot.bin: pilot.c
$(SDCC) -mr2k --no-std-crt0 --code-loc 0x6000 --data-loc 0x7fff pilot.c
#pilot.bin: pilot.c
# $(SDCC) -mr2k --no-std-crt0 --code-loc 0x6000 --data-loc 0x7fff pilot.c

2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT([openrabbit], [0.2.1])
AC_INIT([openrabbit], [0.2.2])

AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE
Expand Down
2 changes: 1 addition & 1 deletion examples/whetstone/portme.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ unsigned long clock(void)
clock0 = ((unsigned long)(RTC0R) << 0) | ((unsigned long)(RTC1R) << 8) | ((unsigned long)(RTC2R) << 16) | ((unsigned long)(RTC3R) << 24);
clock1 = ((unsigned long)(RTC0R) << 0) | ((unsigned long)(RTC1R) << 8) | ((unsigned long)(RTC2R) << 16) | ((unsigned long)(RTC3R) << 24);
} while (clock0 != clock1);
return(clock1 / 32.768);
return(clock1 / 32.768); // Whetstone assumes CLOCKS_PER_SEC to be 1000.
}

int putchar(int c)
Expand Down
2 changes: 1 addition & 1 deletion src/rabbit.c
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ int rabbit_start(int tty)
if(rabbit_reset(tty))
return(-1);

if(rabbit_triplets(tty, start, 1))
if(rabbit_triplets(tty, start, sizeof(start) / 3))
return(-1);
}

0 comments on commit 927b08a

Please sign in to comment.