AVRCON --> USB0

diff --git a/cbios/Makefile b/cbios/Makefile
index 7090dee9a07622bf4ce21b7ff74ce13a8999ad63..e24e41f90ac012fd6606748aa7dc53ff6d47adfd 100644 (file)
--- a/cbios/Makefile
+++ b/cbios/Makefile
@@ -28,7 +28,7 @@ LN_QUIET = 1
 #LNKCMD =
 LN_VERB = /V
 LN_PROG = 0
-LN_DATA = C000
+LN_DATA = F000
 
 
 .suffixes:

diff --git a/cbios/chario.180 b/cbios/chario.180
index 72748e4e96a4373812664f80927a655b7dae4a35..c4c5be67c4d3186aade0c65789fb789aecfad7f0 100644 (file)
--- a/cbios/chario.180
+++ b/cbios/chario.180
@@ -158,19 +158,19 @@ null$status:
 \r
        cseg\r
 @ctbl:\r
-       db      'AVRCON'        ; device 0\r
+       db      'USB0  '                ; device 0\r
        db      mb$in$out\r
        db      baud$none\r
 \r
-       db      'ASCI0 '        ; device 1\r
+       db      'ASCI0 '                ; device 1\r
        db      mb$in$out+mb$serial+mb$soft$baud\r
        db      baud$19200\r
 \r
-       db      'ASCI1 '        ; device 2\r
+       db      'ASCI1 '                ; device 2\r
        db      mb$in$out+mb$serial+mb$soft$baud\r
        db      baud$19200\r
 \r
-       db      0               ; table terminator\r
+       db      0                               ; table terminator\r
 \r
 \r
        end\r

diff --git a/cbios/move.180 b/cbios/move.180
index 1e46c825ee1edeb3e45ef2c980d1b539b7bd2461..aac18403c41a6414f24efdb47d350cb3ad35da98 100644 (file)
--- a/cbios/move.180
+++ b/cbios/move.180
@@ -49,16 +49,13 @@ inter_bank_move:            ; source in HL, dest in DE, count in BC
 
     if 1                       ; works with new memory map
 
-       push    bc
-       push    de
-       push    hl
-
        out0    (bcr0l),c       ; setup DMA count
        out0    (bcr0h),b
 
+       push    hl
+       push    de
        ld      a,(src$bnk)
        call    bnk2phy
-
        out0    (sar0l),l       ; setup DMA src address
        out0    (sar0h),h
        out0    (sar0b),a
@@ -66,7 +63,6 @@ inter_bank_move:              ; source in HL, dest in DE, count in BC
        ex      de,hl
        ld      a,(dst$bnk)
        call    bnk2phy
-
        out0    (dar0l),l       ; setup DMA dst address
        out0    (dar0h),h
        out0    (dar0b),a
@@ -76,10 +72,8 @@ inter_bank_move:             ; source in HL, dest in DE, count in BC
        ld      a,M_DE0+M_NDWE1 ; enable DMA0
        out0    (dstat),a       ; move the block
 
-       pop     hl
        pop     de
-       pop     bc
-
+       pop     hl
        add     hl,bc           ; src must point past end block
        ex      de,hl
        add     hl,bc           ; and so must dst