From: Leo C Date: Mon, 17 Nov 2014 13:06:41 +0000 (+0100) Subject: Change message start token from 0x81 to 0xAE X-Git-Tag: hexrel-4~29 X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/commitdiff_plain/3531528ecedde37d5ebc67a330d192565290175a Change message start token from 0x81 to 0xAE --- diff --git a/avr/z180-serv.c b/avr/z180-serv.c index e6b4efd..a920465 100644 --- a/avr/z180-serv.c +++ b/avr/z180-serv.c @@ -138,7 +138,7 @@ void check_msg_fifo(void) while ((ch = z80_memfifo_getc(fifo_msgin)) >= 0) { switch (state) { case 0: /* wait for start of message */ - if (ch == 0x81) { + if (ch == 0xAE) { /* TODO: magic number */ msglen = 0; idx = 0; state = 1; diff --git a/z180/bioscio.180 b/z180/bioscio.180 index a3a179f..5ec55c6 100644 --- a/z180/bioscio.180 +++ b/z180/bioscio.180 @@ -65,7 +65,7 @@ c$init$loop: dec c jp p,c$init$loop - ld hl,1100000000000000b ; assign console to HOST and ASCI1 + ld hl,1000000000000000b ; assign console to HOST ld (@civec),hl ld (@covec),hl ld hl,0000000000000000b ; assign auxiliary to nothing diff --git a/z180/ddtz.180 b/z180/ddtz.180 index e544b08..10fecf8 100644 --- a/z180/ddtz.180 +++ b/z180/ddtz.180 @@ -251,179 +251,179 @@ DELC1: ret DELL: - ld a,b ;081b - or a ;081c - ret z ;081d - call DELC ;081e - jr DELL ;0821 + ld a,b ; + or a ; + ret z ; + call DELC ; + jr DELL ; INLINE: - push hl ;0823 - ld hl,CI.BUF ;0824 - ld c,(hl) ;0827 - inc hl ;0828 - ld b,000h ;0829 - inc hl ;082b + push hl ; + ld hl,CI.BUF ; + ld c,(hl) ; + inc hl ; + ld b,000h ; + inc hl ; inlnxtch: - ld a,c ;082c - or a ;082d - jr z,inl_e ;082e - call $ci ;0830 - cp CR ;0833 - jr z,inl_e ;0835 - cp LF ;0837 - jr z,inl_e ;0839 - cp BS ;083b - jr nz,l0844h ;083d - call DELC ;083f - jr inlnxtch ;0842 + ld a,c ; + or a ; + jr z,inl_e ; + call $ci ; + cp CR ; + jr z,inl_e ;Accept line + cp LF ; + jr z,inl_e ;Accept line + cp BS ; + jr nz,l0844h ; + call DELC ;Delete Char + jr inlnxtch ; l0844h: - cp DEL ;0844 - jr nz,l084dh ;0846 - call DELC ;0848 - jr inlnxtch ;084b + cp DEL ; + jr nz,l084dh ; + call DELC ;Delete Char + jr inlnxtch ; l084dh: - cp CNTRX ;084d - jr nz,l0856h ;084f - call DELL ;0851 - jr inlnxtch ;0854 + cp CNTRX ; + jr nz,l0856h ; + call DELL ;Delete Line + jr inlnxtch ; l0856h: - cp TAB ;0856 - jr nz,l085ch ;0858 - ld a,' ' ;085a + cp TAB ; + jr nz,l085ch ; + ld a,' ' ; l085ch: - ld (hl),a ;085c - cp ' ' ;085d - jr nc,l0869h ;085f - ld a,'^' ;0861 - call $co ;0863 - ld a,(hl) ;0866 - add a,'@' ;0867 + ld (hl),a ; + cp ' ' ; + jr nc,l0869h ; + ld a,'^' ;Controle characters + call $co ; + ld a,(hl) ; + add a,'@' ; l0869h: - call $co ;0869 - inc hl ;086c - inc b ;086d - dec c ;086e - jr inlnxtch ;086f + call $co ; + inc hl ; + inc b ; + dec c ; + jr inlnxtch ; inl_e: - ld hl,ci.buf+1 ;0871 - ld (hl),b ;0874 - call CRLF ;0875 - ld de,ci.buf+1 ;0878 - ld a,(de) ;087b - ld b,a ;087c - ld c,000h ;087d - inc b ;087f + ld hl,ci.buf+1 ; + ld (hl),b ; + call CRLF ; + ld de,ci.buf+1 ; + ld a,(de) ; + ld b,a ; + ld c,000h ; + inc b ; l0880h: - inc de ;0880 - dec b ;0881 - jr z,l08b2h ;0882 - ld a,(de) ;0884 - bit 0,c ;0885 - call z,UPCASE ;0887 - ld (de),a ;088a - cp '''' ;088b - jr nz,l0880h ;088d - push de ;088f - dec de ;0890 - ld a,(de) ;0891 - cp '''' ;0892 - jr z,l08aeh ;0894 - dec de ;0896 - ld a,(de) ;0897 - cp '^' ;0898 - jr z,l08a2h ;089a - dec de ;089c - ld a,(de) ;089d - cp '^' ;089e - jr nz,l08aeh ;08a0 + inc de ; + dec b ; + jr z,l08b2h ; + ld a,(de) ; + bit 0,c ; + call z,UPCASE ; + ld (de),a ; + cp '''' ; + jr nz,l0880h ; + push de ; + dec de ; + ld a,(de) ; + cp '''' ; + jr z,l08aeh ; + dec de ; + ld a,(de) ; + cp '^' ; + jr z,l08a2h ; + dec de ; + ld a,(de) ; + cp '^' ; + jr nz,l08aeh ; l08a2h: - inc de ;08a2 - push bc ;08a3 - call sub_0a0eh ;08a4 - pop bc ;08a7 - dec de ;08a8 - ld a,(de) ;08a9 - cp '''' ;08aa - jr z,l08afh ;08ac + inc de ; + push bc ; + call sub_0a0eh ; + pop bc ; + dec de ; + ld a,(de) ; + cp '''' ; + jr z,l08afh ; l08aeh: - inc c ;08ae + inc c ; l08afh: - pop de ;08af - jr l0880h ;08b0 + pop de ; + jr l0880h ; l08b2h: - xor a ;08b2 - ld (de),a ;08b3 - ld de,ci.buf+2 ;08b4 - pop hl ;08b7 - ret ;08b8 + xor a ; + ld (de),a ; + ld de,ci.buf+2 ; + pop hl ; + ret ; UPCASE: - cp 'a' ;08b9 - ret c ;08bb - cp 'z'+1 ;08bc - ret nc ;08be - and 05fh ;08bf - ret ;08c1 + cp 'a' ; + ret c ; + cp 'z'+1 ; + ret nc ; + and 05fh ; + ret ; out.hl.@: - call out.hl ;08c2 - push de ;08c5 - push hl ;08c6 - ld de,(offs.@) ;08c7 - ld a,d ;08cb - or e ;08cc - jr z,l08ddh ;08cd - call OUTBL ;08cf - ld a,'@' ;08d2 - call OUTCHAR ;08d4 - and a ;08d7 - sbc hl,de ;08d8 - call out.hl ;08da + call out.hl ; + push de ; + push hl ; + ld de,(offs.@) ; + ld a,d ; + or e ; + jr z,l08ddh ; + call OUTBL ; + ld a,'@' ; + call OUTCHAR ; + and a ; + sbc hl,de ; + call out.hl ; l08ddh: - pop hl ;08dd - pop de ;08de - ret ;08df + pop hl ; + pop de ; + ret ; out.bin.w: - ld a,h ;08e0 - call out.bin.b ;08e1 - ld a,l ;08e4 + ld a,h ; + call out.bin.b ; + ld a,l ; out.bin.b: - ld b,008h ;08e5 + ld b,008h ; l08e7h: - add a,a ;08e7 - push af ;08e8 - ld a,0 ;08e9 - adc a,a ;08eb - call out.digit ;08ec - pop af ;08ef - djnz l08e7h ;08f0 - ld a,'"' ;08f2 - jp OUTCHAR ;08f4 + add a,a ; + push af ; + ld a,0 ; + adc a,a ; + call out.digit ; + pop af ; + djnz l08e7h ; + ld a,'"' ; + jp OUTCHAR ; sub_08f7h: - ld a,'-' ;08f7 - call OUTCHAR ;08f9 - dec hl ;08fc - jp cpl.hl ;08fd + ld a,'-' ; + call OUTCHAR ; + dec hl ; + jp cpl.hl ; out.hl.decm: - push hl ;0900 - call sub_08f7h ;0901 - db 3eh ;0904 ld a,0E5h + push hl ; + call sub_08f7h ; + db 3eh ; ld a,0E5h out.hl.dec: push hl - ld b,6 ;0906 - call sub_0917h ;0908 - pop hl ;090b - ld a,'.' ;090c - call OUTCHAR ;090e + ld b,6 ; + call sub_0917h ; + pop hl ; + ld a,'.' ; + call OUTCHAR ; l0911h: - call OUTBL ;0911 - djnz l0911h ;0914 - ret ;0916 + call OUTBL ; + djnz l0911h ; + ret ; sub_0917h: @@ -2724,10 +2724,9 @@ l1698h: ret ;169a ; Read Intel Hex File from console. - CMD.R: ld hl,0 ;169b - call get_lastarg_def ;169e + call get_lastarg_def ;169e get offset from command line push hl ;16a1 ld hl,0 ;16a2 ld (HILOD),hl ;16a5 @@ -2749,15 +2748,15 @@ w_recstart: jr z,l16deh ;16c4 l16c6h: call i.gethexbyte ;16c6 - pop de ;16c9 + pop de ;16c9 offset push de ;16ca push hl ;16cb add hl,de ;16cc call i.storebyte ;16cd pop hl ;16d0 inc hl ;16d1 - djnz l16c6h ;16d2 - call i.gethexbyte ;16d4 + djnz l16c6h ;16d2 repeat for record len + call i.gethexbyte ;16d4 checksum ld a,c ;16d7 and a ;16d8 jp nz,ERROR ;16d9 exit if checksum error @@ -2798,10 +2797,10 @@ i.getchar: i.storebyte: push af ;1708 push de ;1709 - ld de,TPA ;170a + ld de,TPA ;170a lowest allowed load address call CP.HL.DE ;170d jp c,ERROR ;1710 - ld de,$stcka ;1713 + ld de,$stcka ;1713 highest allowed load address call CP.HL.DE ;1716 jp nc,ERROR ;1719 ld de,(HILOD) ;171c @@ -2817,7 +2816,7 @@ l1734h: pop de ;1734 pop af ;1735 comst ;1736 - ld (hl),a ;173a + ld (hl),a ;173a store byte comend ret ;173b diff --git a/z180/msgbuf-a.180 b/z180/msgbuf-a.180 index f52074e..36e0871 100644 --- a/z180/msgbuf-a.180 +++ b/z180/msgbuf-a.180 @@ -187,7 +187,7 @@ msg.co: buf: db buf_end - $ - 1 ;output string length - db 081h ; message start token + db 0AEh ; message start token db buf_end - $ - 1 ; message length db 1 ; command db 1 ; subcommand diff --git a/z180/msgbuf-s.180 b/z180/msgbuf-s.180 index 2c67527..6bfd709 100644 --- a/z180/msgbuf-s.180 +++ b/z180/msgbuf-s.180 @@ -115,7 +115,7 @@ msg.co: buf: db buf_end - $ - 2 ;output string length db PMSG ;output port - db 081h ; message start token + db 0AEh ; message start token db buf_end - $ - 1 ; message length db 1 ; command db 1 ; subcommand diff --git a/z180/r3init.180 b/z180/r3init.180 index 9adbdd8..9edeaf2 100644 --- a/z180/r3init.180 +++ b/z180/r3init.180 @@ -357,7 +357,7 @@ bufferinit: inimsg: db inimsg_e - $ - 1 - db 81h + db 0AEh db inimsg_e - $ - 1 db 0 bufdat: @@ -423,7 +423,7 @@ buftablen equ ($ - buffers)/3 inimsg: db inimsg_e - $ -1 - db 81h + db 0AEh db inimsg_e - $ -1 db 0 bufdat: