Merge pull request #4 from erique/add-usb

Add auto-booting Poseidon USB stack, as ROM

Author: Takasa

addmem/AddReplayMem

@@ -2,12 +2,14 @@ VASM_FLAGS	:= -quiet -Fhunkexe -kick1hunks -nosym -m68000
 
 TARGET		:= AddReplayMem
 SOURCE		:= addmem.asm
+INCLUDES	:= kprintf.i
 LISTFILE	:= $(addsuffix .txt,$(basename $(TARGET)))
 
 all: $(TARGET)
 	@echo ""
 
 $(TARGET): Makefile | buildenv
+$(TARGET): $(INCLUDES)
 $(TARGET): $(SOURCE)
 	$(VASM) $< -o $@ -L $(LISTFILE) $(VASM_FLAGS) -I $(INC_ASM)
 

addmem/Makefile

@@ -15,58 +15,78 @@
 
 ; vasmm68k_mot -Fhunkexe -kick1hunks addmem.asm -L addmem.list -nosym -m68000 -o AddReplayMem -I ~/Documents/amiga-root/SYS/Code/NDK_3.9/Include/include_i
 
+;ENABLE_KPRINTF
+
+	include	exec/memory.i
 	include	exec/nodes.i
 	include	exec/resident.i
+	include	exec/exec.i
+	include	lvo/exec_lib.i
+	include kprintf.i
 
-_LVOAllocMem    equ	-198
-_LVOFreeMem     equ	-210
-_LVOTypeOfMem   equ	-534
-_LVOAddMemList  equ	-618
-_LVOOpenLibrary equ	-552
-_LVOCloseLibrary equ	-414
 _LVOPutStr      equ	-948
-MEMF_PUBLIC     equ    (1<<0)
-MEMF_CHIP       equ    (1<<1)
-MEMF_FAST       equ    (1<<2)
 MEMF_REPLAY     equ    (1<<14)
 
 	jmp	S
 	moveq.l	#-1,d0
 	rts
 
 VERSION	= 1
-REVISION= 5
 
-	dc.b	0,'$VER: AddReplayMem 1.5 (20.9.2018) Replay XRAM',0
-VERSTRING	dc.b	'AddReplayMem 1.5 (20.9.2018) Replay XRAM',13,10,0
+	dc.b	0,'$VER: AddReplayMem 1.7 (19.2.2020) Replay XRAM',0
 	even
-	
+VERSTRING	dc.b	'AddReplayMem 1.7 (19.2.2020) Replay XRAM',13,10,0
+	even
+
+	cnop	0,4
 romtag:	dc.w	RTC_MATCHWORD
 	dc.l	romtag
 	dc.l	end
-	dc.b	RTF_COLDSTART
+	dc.b	RTF_SINGLETASK
 	dc.b	VERSION
 	dc.b	NT_UNKNOWN
-	dc.b	0
+	dc.b	108
 	dc.l	tagname
 	dc.l	VERSTRING
 	dc.l	S
 
 tagname:	dc.b	'AddReplayMem',0
 	even
-	
+
+MIN_ROM_SIZE = (4*1024)
+MAX_ROM_SIZE = (1024*1024)
+
+	cnop	0,4
 S:
+	kprintf	"INIT: %s",#VERSTRING
+
 	movem.l	d2-d6/a2-a6,-(sp)
 
+; 1.7 - Add a dummy memory node for the $00F0.0000 replay.rom memory region (to prevent mmu.library cache-inhibit state)
+; 1.6 - Fix memory trashing when probing; Change to RTF_SINGLETASK (before Exec); Add logging
 ; 1.5 - Make ROMable
 ; 1.4 - Add console logging; Fix building with vasm.
 ; 1.3 - Label the memory region as REPLAY memory (unused bit 14)
 ; 1.2 - Probe the memory region to see if it's already been added (using exec.library/TypeOfMem())
 ; 1.1 - Detect 24 bit (000/010/EC020) memory space (by detecting mirroring of CHIP above the 16M barrier)
 ; 1.0 - Probe memory to make sure it's actually present
 
-	; Check if already registered
+	; Check if ROM is mapped as RAM
 	movea.l	$4.w,a6
+	lea	$00f01000,a1
+	jsr	_LVOTypeOfMem(a6)
+	tst.l	d0
+	bne	.already_mapped
+
+	bsr	MapROMasRAM
+	tst.l	d0
+	bmi	.quit_checksum
+
+	kprintf	<"      rom is %ld bytes",10>,d0
+
+.already_mapped
+
+	; Check if already registered
 	lea	$01001000,a1
 	jsr	_LVOTypeOfMem(a6)
 	tst.l	d0
@@ -124,26 +144,52 @@ S:
 
 	neg.b	d4
 	cmp.b	#32,d4
-	bne.b	.quit_24bit
+	bne	.quit_24bit
 
 	; Probe the memory to see if it's there
+	jsr	_LVODisable(a6)
+
 	lea	$01000000,a0
 	moveq.l	#$30-1,d7
-.probe	movem.l	d0-d3,(a0)
+.probe
+	; save memory contents
+	movem.l	(a0),d4/d5/a4/a5
+	movem.l	d4/d5/a4/a5,-(sp)
+	movem.l	$4000(a0),d4/d5/a4/a5
+	movem.l	d4/d5/a4/a5,-(sp)
+
+	; write known values
+	movem.l	d0-d3,(a0)
+
+	; write noise at 16KB ahead
 	lea	$4000(a0),a1
 	movem.l	$4.w,a2-a5
 	movem.l	a2-a5,(a1)
+
+	; make sure the original write is valid
 	move.l	a0,a1
 	cmp.l	(a1)+,d0
-	bne.b	.quit_probing
+	bne.b	.probe_failed
 	cmp.l	(a1)+,d1
-	bne.b	.quit_probing
+	bne.b	.probe_failed
 	cmp.l	(a1)+,d2
-	bne.b	.quit_probing
+	bne.b	.probe_failed
 	cmp.l	(a1)+,d3
-	bne.b	.quit_probing
+
+.probe_failed
+	; restore memory contents
+	movem.l	(sp)+,d4/d5/a4/a5
+	movem.l	d4/d5/a4/a5,$4000(a0)
+	movem.l	(sp)+,d4/d5/a4/a5
+	movem.l	d4/d5/a4/a5,(a0)
+
 	add.l	#$00100000,a0
-	dbf	d7,.probe
+	dbne	d7,.probe
+
+	jsr	_LVOEnable(a6)
+
+	tst.b	d7
+	bpl.b	.quit_probing
 
 	moveq.l	#name_end-name,d0
 	moveq.l	#0,d1
@@ -167,6 +213,8 @@ S:
 	lea	memory_added(pc),a5
 	bra.b	.quit
 
+.quit_checksum	lea	checksum_failed(pc),a5
+		bra.b	.quit
 .quit_present	lea	already_there(pc),a5
 		bra.b	.quit
 .quit_24bit	lea	cpu_is_24bit(pc),a5
@@ -175,7 +223,9 @@ S:
 		bra.b	.quit
 .quit_alloc	lea	alloc_failed(pc),a5
 
-.quit	lea	dos(pc),a1
+.quit
+	kprintf	"      %s",a5
+	lea	dos(pc),a1
 	moveq.l	#36,d0		; putstr is kick 2.x+
 	movea.l	$4.w,a6
 	jsr	_LVOOpenLibrary(a6)
@@ -197,12 +247,94 @@ S:
 
 name		dc.b 'replay xram memory',0
 name_end
+romname		dc.b 'replay.rom memory',0
+romname_end
 dos		dc.b 'dos.library',0
+checksum_failed	dc.b 'rom checksum failed',10,0
 already_there	dc.b 'memory is already available',10,0
 cpu_is_24bit	dc.b 'cpu uses a 24bit address bus (68000/010/EC020)',10,0
 probing_failed	dc.b 'memory probing failed',10,0
 alloc_failed	dc.b 'memory allocation failed',10,0
 memory_added	dc.b 'memory region added',10,0
 
+	cnop	0,4
+
+MapROMasRAM:
+	; Find replay ROM size
+	lea	$00f00000,a0
+	move.l	#MIN_ROM_SIZE,d0
+	move.l	#MAX_ROM_SIZE,d1
+
+	; a0.l = ROM start
+	; d0.l = start ROM size (16 bytes min)
+	; d1.l = end ROM size (1MB max)
+
+	move.l	d0,d7
+	moveq	#0,d5
+	moveq	#0,d6
+.cont	lsr.l	#4,d7
+	bra.b	.start
+.loop:	rept 4
+	add.l	(a0)+,d5
+	addx.l	d6,d5
+	endr
+.start	dbf	d7,.loop
+
+	not.l	d5
+	beq.b	.sumok
+	not.l	d5
+
+	move.l	d0,d7
+	add.l	d0,d0
+	cmp.l	d1,d0
+	bne.b	.cont
+.error	moveq.l	#-1,d0
+	rts
+.sumok	move.l	d0,d2
+
+	; Allocate a dummy memlist header + memlist name + 'free'list
+	moveq.l	#MH_SIZE+MC_SIZE+(romname_end-romname),d0
+	moveq.l	#0,d1
+	jsr	_LVOAllocMem(a6)
+	tst.l	d0
+	beq	.error
+
+	; Fill out the memlist header based on the ROM details
+	move.l	d0,a0
+	clr.l	LN_SUCC(a0)
+	clr.l	LN_PRED(a0)
+	move.b	#NT_MEMORY,LN_TYPE(a0)
+	move.b	#-128,LN_PRI(a0)
+	move.w	#0,MH_ATTRIBUTES(a0)
+
+	; This is the 'empty' freelist node
+	lea	MH_SIZE(a0),a1
+	move.l	a1,MH_FIRST(a0)
+	clr.l	(a1)+		; MC_NEXT
+	clr.l	(a1)+		; MC_BYTES
+
+	; Set the ROM memory name
+	move.l  a1,LN_NAME(a0)
+	lea	romname(pc),a2
+	moveq.l	#romname_end-romname,d1
+.name	move.b	(a2)+,(a1)+
+	dbf	d1,.name
+
+	; Set the memlist lower and upper bound (matching ROM)
+	lea	$00f00000,a1
+	move.l	a1,MH_LOWER(a0)
+	move.l	a1,MH_UPPER(a0)
+	add.l	d2,MH_UPPER(a0)
+	clr.l	MH_FREE(a0)
+
+	; Use the *private* execbase member 'MemList' to enqueue the ROM memlist
+	move.l	a0,a1
+	lea.l	MemList(a6),a0
+	jsr	_LVOForbid(a6)
+	jsr	_LVOEnqueue(a6)
+	jsr	_LVOPermit(a6)
+
+	move.l	d2,d0	; ROM size
+	rts
 end
 

addmem/addmem.asm

@@ -0,0 +1,82 @@
+;
+; WWW.FPGAArcade.COM
+;
+; REPLAY Retro Gaming Platform
+; No Emulation No Compromise
+;
+; AddReplayMem - Memory configuration tool for the REPLAY Amiga core
+; Copyright (C) FPGAArcade community
+;
+; Contributors : Mike Johnson, Jim Drew, Erik Hemming
+;
+; This software is licensed under LPGLv2.1 ; see LICENSE file
+;
+;
+
+kprintf	MACRO
+	IFD	ENABLE_KPRINTF
+
+	ifnc	"","\9"
+		move.l  \9,-(sp)
+	endc
+	ifnc	"","\8"
+		move.l  \8,-(sp)
+	endc
+	ifnc	"","\7"
+		move.l  \7,-(sp)
+	endc
+	ifnc	"","\6"
+		move.l  \6,-(sp)
+	endc
+	ifnc	"","\5"
+		move.l  \5,-(sp)
+	endc
+	ifnc	"","\4"
+		move.l  \4,-(sp)
+	endc
+	ifnc	"","\3"
+		move.l  \3,-(sp)
+	endc
+	ifnc	"","\2"
+		move.l  \2,-(sp)
+	endc
+
+	jsr	_kprintf
+
+	dc.b	\1,0
+	even
+
+	adda.w	#(NARG-1)*4,sp
+
+.skip\@
+	ENDC
+	ENDM
+
+	IFD	ENABLE_KPRINTF
+	bra.b	_kprintf_end
+_kprintf:	movem.l	d0-d1/a0-a3/a6,-(sp)	
+		move.l	$4.w,a6
+		move.l	28(sp),a0
+		lea	32(sp),a1
+		lea	.putch(pc),a2
+		move.l	a6,a3
+		jsr	-522(a6)		; _LVORawDoFmt
+
+		move.l	28(sp),a0
+.end:		move.b	(a0)+,d0
+		bne.b	.end
+		move.l	a0,d0
+		addq.l	#1,d0
+		and.l	#$fffffffe,d0
+		move.l	d0,28(sp)
+		movem.l	(sp)+,d0-d1/a0-a3/a6
+		rts
+
+.putch:		movem.l	d0-d1/a0-a1/a6,-(sp)
+		move.l	$4.w,a6
+		jsr	-516(a6)		; _LVORawPutChar (execPrivate9)
+		movem.l	(sp)+,d0-d1/a0-a1/a6
+		rts
+_kprintf_end:
+	ENDC
+

addmem/kprintf.i

@@ -1,6 +1,13 @@
 #!/bin/bash
-romtool -v build -o replay.rom -t ext -s 64 -e f00000 -a f00010 -r 01.04 bootrom/bootrom.bin addmem/AddReplayMem rtc/battclock.resource usb/usb_eth.autoconfig usb/replayusb.device
+set -e
+
+romtool -v build -o replay.rom -t ext -s 64 -e f00000 -a f00010 -r 01.05 -f bootrom/bootrom.bin addmem/AddReplayMem poseidon/PoseidonLoader rtc/battclock.resource usb/usb_eth.autoconfig usb/replayusb.device
 printf "000001: 11" | xxd -r - replay.rom
-#romtool info replay.rom
+romtool copy -c replay.rom replay.rom
+romtool info replay.rom
 romtool scan replay.rom
 #romtool dump replay.rom | less
+
+romtool -v build -o poseidon.rom -t ext -s 512 -e 3f80000 -a 3f80000 -r 01.00 -f  poseidon/hid.class poseidon/hub.class poseidon/input.device poseidon/massstorage.class poseidon/poseidon.library poseidon/PsdStackloader
+romtool scan poseidon.rom
+romtool info poseidon.rom