Mercurial > hg > Members > kono > nitros9-code

changeset 2959:ee6df245e208

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bootman: Port to lwtools
author Tormod Volden <debian.tormod@gmail.com>
date Sun, 09 Feb 2014 23:13:31 +0100
parents 77500452de1c
children 45641253a49a
files bootman/boot_config.as bootman/bootman.as bootman/llbt_1773.as bootman/llio_6551.as bootman/mach_coco.as bootman/mach_coco3.as bootman/makefile
diffstat 7 files changed, 34 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/bootman/boot_config.as	Sun Feb 09 22:53:29 2014 +0100
+++ b/bootman/boot_config.as	Sun Feb 09 23:13:31 2014 +0100
@@ -1,7 +1,7 @@
          NAM    boot_config
          TTL    Boot manager configuration
 
-         PSECT  bc,0,0,0,0,boot_config
+         SECTION code
 
 boot_config:
 
@@ -16,4 +16,4 @@
 *          fdb    llbt_ide,$FF50,0
           fdb    $0000
          
-         endsect
+         ENDSECT
--- a/bootman/bootman.as	Sun Feb 09 22:53:29 2014 +0100
+++ b/bootman/bootman.as	Sun Feb 09 23:13:31 2014 +0100
@@ -3,20 +3,25 @@
 
 BOOTTRACK equ   0
 
-
-         PSECT  bootman,$11,$80,0,0,entry
-
-         VSECT
+         SECTION __os9
+TYPE     EQU    $11          Prgrm($10)+Objct($01)
+ATTR     EQU    $80          REEntrent
+REV      EQU    $00          Revision level
          ENDSECT
 
 TOP      EQU   $FE00
 
 * The entry point of the boot manager
 * Entry: stack is set up, U points to static storage
-         csect
+
+         SECTION bss
 sectptr  rmb    2
-         endsect
+         ENDSECT
 
+         SECTION code
+
+__start  EXPORT
+__start
 entry    lbsr   mach_init   initialize the machine we're running on
          leas   entry,pcr   set up stack
          leau   entry-256,pcr set up static storage
@@ -66,4 +71,4 @@
 writedone
          puls    y,pc
          
-         endsect
+         ENDSECT
--- a/bootman/llbt_1773.as	Sun Feb 09 22:53:29 2014 +0100
+++ b/bootman/llbt_1773.as	Sun Feb 09 23:13:31 2014 +0100
@@ -1,10 +1,7 @@
          NAM    llbt_1773
          TTL    WD1773 low-level booter
 
-         PSECT  llbt_1773,0,0,0,0,llbt_1773
-
-         VSECT
-         ENDSECT
+         SECTION code
 
 llbt_1773:
          lbsr   llinit
@@ -25,4 +22,4 @@
 info     fcc    "Floppy disk drive"
          fcb    0
 
-         endsect
+         ENDSECT
--- a/bootman/llio_6551.as	Sun Feb 09 22:53:29 2014 +0100
+++ b/bootman/llio_6551.as	Sun Feb 09 23:13:31 2014 +0100
@@ -1,10 +1,7 @@
          NAM    llio_coco3
          TTL    CoCo 3 low-level I/O handler
 
-         PSECT  llio_coco3,0,0,0,0,llio
-
-         VSECT
-         ENDSECT
+         SECTION code
 
 llio:
          lbsr   llinit
@@ -133,4 +130,4 @@
                bra       m@
                ENDC
 
-         endsect
+         ENDSECT
--- a/bootman/mach_coco.as	Sun Feb 09 22:53:29 2014 +0100
+++ b/bootman/mach_coco.as	Sun Feb 09 23:13:31 2014 +0100
@@ -1,10 +1,7 @@
          NAM    mach_coco
          TTL    CoCo machine routines
 
-         PSECT  mach_coco,0,0,0,0,mach_init
-
-         VSECT
-         ENDSECT
+         SECTION code
 
 PIA0Base equ   $FF00
 PIA1Base equ   $FF20
@@ -53,4 +50,4 @@
 
          rts
          
-         endsect
+         ENDSECT
--- a/bootman/mach_coco3.as	Sun Feb 09 22:53:29 2014 +0100
+++ b/bootman/mach_coco3.as	Sun Feb 09 23:13:31 2014 +0100
@@ -1,10 +1,7 @@
          NAM    mach_coco
          TTL    CoCo machine routines
 
-         PSECT  mach_coco3,0,0,0,0,mach_init
-
-         VSECT
-         ENDSECT
+         SECTION code
 
 PIA0Base equ   $FF00
 PIA1Base equ   $FF20
@@ -113,4 +110,4 @@
          fcb   $26
  
 
-         endsect
+         ENDSECT
--- a/bootman/makefile	Sun Feb 09 22:53:29 2014 +0100
+++ b/bootman/makefile	Sun Feb 09 23:13:31 2014 +0100
@@ -1,20 +1,22 @@
 include ../rules.mak
 
-all: bootman_coco_6551 bootman_coco3_6551 #bootman_loader
+BOOTMAN = bootman_coco_6551 bootman_coco3_6551
 
-bootman_loader: bootman_loader.a
-	mamou $^ -o$@ -mb
+all: $(BOOTMAN)
 
-bootman_coco_6551: bootman.r boot_config.r mach_coco.r llio_6551.r llbt_1773.r
-	$(LINKER) $^ -o=$@
+bootman_coco_6551: bootman.o boot_config.o mach_coco.o llio_6551.o llbt_1773.o
+	$(LINKER) $^ -o$@
 
-bootman_coco3_6551: bootman.r boot_config.r mach_coco3.r llio_6551.r llbt_1773.r
-	$(LINKER) $^ -o=$@
+bootman_coco3_6551: bootman.o boot_config.o mach_coco3.o llio_6551.o llbt_1773.o
+	$(LINKER) $^ -o$@
 
-dsk: bootman
+dsk: $(BOOTMAN)
 	decb dskini bootman.dsk
 	decb copy -b -2 bootman_coco_6551 bootman.dsk,BM6551.BIN
 	decb copy -b -2 bootman_coco3_6551 bootman.dsk,BM36551.BIN
 
-clean:
-	$(RM) *.r bootman_coco_6551 bootman_coco3_6551 bootman.dsk
+dskclean:
+	$(RM) bootman.dsk
+
+clean: dskclean
+	$(RM) *.o bootman_coco_6551 bootman_coco3_6551 bootman.dsk