From e69570e75fa7cde9ba6090941edb43d5bbd3409a Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 17 Jun 2015 12:19:56 +0100 Subject: [PATCH] coco3: trimmed trailing white space in a few spots --- Kernel/platform-coco3/Makefile | 10 +++++----- Kernel/platform-coco3/README | 6 +++--- Kernel/platform-coco3/build | 2 +- Kernel/platform-coco3/coco3.s | 22 ++++++++++------------ Kernel/platform-coco3/crt0.s | 10 +++++----- Kernel/platform-coco3/kernel.def | 2 +- 6 files changed, 25 insertions(+), 27 deletions(-) diff --git a/Kernel/platform-coco3/Makefile b/Kernel/platform-coco3/Makefile index 7b06d4ba..26452ac5 100644 --- a/Kernel/platform-coco3/Makefile +++ b/Kernel/platform-coco3/Makefile @@ -1,8 +1,8 @@ CSRCS = devtty.c ttydw.c -CSRCS += devices.c main.c libc.c +CSRCS += devices.c main.c libc.c -DSRCS = ../dev/devdw.c +DSRCS = ../dev/devdw.c ASRCS = coco3.s crt0.s ASRCS += tricks.s commonmem.s usermem_gime.s drivewire.s @@ -16,7 +16,7 @@ CROSS_CCOPTS += -I../dev/ JUNK = $(CSRCS:.c=.o) $(ASRCS:.s=.o) -all: $(OBJS) +all: $(OBJS) $(COBJS): %$(BINEXT): %.c $(CROSS_CC) $(CROSS_CCOPTS) -c $< @@ -29,10 +29,10 @@ $(AOBJS): %$(BINEXT): %.s clean: - rm -f $(OBJS) $(JUNK) core *~ + rm -f $(OBJS) $(JUNK) core *~ image: - $(CROSS_CC) $(CROSS_CCOPTS) -O0 -c -o ../bank16k.o ../bank16k.c + $(CROSS_CC) $(CROSS_CCOPTS) -O0 -c -o ../bank16k.o ../bank16k.c $(CROSS_LD) -o ../fuzix.bin --map=../fuzix.map --script=fuzix.link \ crt0.o commonmem.o \ coco3.o ../start.o ../version.o ../lowlevel-6809.o \ diff --git a/Kernel/platform-coco3/README b/Kernel/platform-coco3/README index 19a0f396..f896405c 100644 --- a/Kernel/platform-coco3/README +++ b/Kernel/platform-coco3/README @@ -55,7 +55,7 @@ as the root filesystem. ************************* -KEYBOARD +KEYBOARD ************************* Some work needs done on the support on the ALT key shifting. The ALT @@ -75,7 +75,7 @@ DEVICES (so far) node major minor description /dev/tty1 2 1 console / virtual terminal No. 1. /dev/tty2 2 2 virtual terminal No. 2. -/dev/tty3 2 3 Drivewire Virtual Window #0 +/dev/tty3 2 3 Drivewire Virtual Window #0 /dev/dw? 8 0-256 Drivewire Block Drives @@ -99,7 +99,7 @@ make -C Applications/util -f Makefile.6809 TARGET=coco3 # 4. Build disk tools make -C Standalone -# 5. Build boot disk image +# 5. Build boot disk image cd Standalone/filesystem-src ./build-filesystem -X fuzix.dsk 256 65535 diff --git a/Kernel/platform-coco3/build b/Kernel/platform-coco3/build index f09a45c4..da805f2b 100755 --- a/Kernel/platform-coco3/build +++ b/Kernel/platform-coco3/build @@ -1,7 +1,7 @@ # remake kernel cd .. -make TARGET=coco3 clean +make TARGET=coco3 clean # specially make bank16.c (bug fix for compile fart?) #m6809-unknown-gcc -c -Wall -msoft-reg-count=0 -mfar-stack-param -I cpu-6809 -I platform-coco3 -I include -o bank16k.o bank16k.c diff --git a/Kernel/platform-coco3/coco3.s b/Kernel/platform-coco3/coco3.s index c0127b22..796bece7 100644 --- a/Kernel/platform-coco3/coco3.s +++ b/Kernel/platform-coco3/coco3.s @@ -38,7 +38,7 @@ include "../kernel09.def" ; ----------------------------------------------------------------------------- -; COMMON MEMORY BANK +; COMMON MEMORY BANK ; ----------------------------------------------------------------------------- .area .common @@ -70,7 +70,7 @@ bounce@ jmp [0xfffe] ; jmp to reset vector bounce_end@ - + ;;; Turn off interrupts ;;; takes: nothing @@ -95,7 +95,7 @@ _irqrestore: ; B holds the data rts ; ----------------------------------------------------------------------------- -; KERNEL MEMORY BANK +; KERNEL MEMORY BANK ; ----------------------------------------------------------------------------- .area .text @@ -174,7 +174,7 @@ _program_vectors: ldb #0x7E stb 0 jsr map_kernel - rts + rts ;;; This clear the interrupt source before calling the ;; normal handler @@ -183,7 +183,7 @@ _program_vectors: my_interrupt_handler lda $ff02 ; clear pia irq latch by reading data port jmp interrupt_handler ; jump to regular handler - + ;;; FIXME: these interrupt handlers should prolly do something ;;; in the future. firq_handler: @@ -239,7 +239,7 @@ map_process_2: sta ,y+ ; put it in mmu ;; map the rest of the block in order -* ldy #0xffa0 ; +* ldy #0xffa0 ; lda ,x+ sta ,y+ inca @@ -249,11 +249,11 @@ map_process_2: sta ,y+ inca sta ,y+ - + * lda ,x+ lda #6 sta ,y+ - inca + inca sta ,y lda #0 @@ -261,7 +261,6 @@ map_process_2: sta init1_mirror ; and save INIT1 setting in mirror puls x,y,a,pc ; so had better include common! - ;;; ;;; Restore a saved mapping. We are guaranteed that we won't switch ;;; common copy between save and restore. Preserve all registers @@ -276,7 +275,7 @@ map_restore: sta init1_mirror sta 0xff91 puls a,pc - + ;;; Save current mapping ;;; takes: nothing ;;; returns: nothing @@ -290,7 +289,7 @@ saved_map: .db 0 ; which mapping state where we in? init1_mirror: .db 0 ; a *mirror* of gimme $ff91, which is WriteOnly _need_resched .db 0 ; scheduler flag - + ;;; Print a character to debugging ;;; takes: A = character @@ -304,4 +303,3 @@ outchar: .area .data scrPos .dw 0xb400 ; debugging screen buffer position - diff --git a/Kernel/platform-coco3/crt0.s b/Kernel/platform-coco3/crt0.s index 7bb47977..89067354 100644 --- a/Kernel/platform-coco3/crt0.s +++ b/Kernel/platform-coco3/crt0.s @@ -1,7 +1,7 @@ -;;; +;;; ;;; The Kernel C run-time / start routine -;;; - +;;; + ;;; imported symbols .globl _fuzix_main .globl init_early @@ -20,7 +20,7 @@ start: orcc #0x10 ; interrupts definitely off lds #kstack_top - + ;; zero out kernel's bss section ldx #__sectionbase_.bss__ ldy #__sectionlen_.bss__ @@ -28,7 +28,7 @@ bss_wipe: clr ,x+ leay -1,y bne bss_wipe - + jsr init_early jsr init_hardware jsr _fuzix_main diff --git a/Kernel/platform-coco3/kernel.def b/Kernel/platform-coco3/kernel.def index c0611128..25ec3981 100644 --- a/Kernel/platform-coco3/kernel.def +++ b/Kernel/platform-coco3/kernel.def @@ -6,7 +6,7 @@ U_DATA__TOTALSIZE equ 0x200 ; 256+256 bytes. U_DATA_STASH equ 0xBd00 ; FC00-FEFF -;;; We don't need these macros for we have no +;;; We don't need these macros for we have no ;;; SAM shenanigans on a CoCo3 SAM_USER macro -- 2.34.1