diff --git a/Console/CONSOLE.ASM b/Console/CONSOLE.ASM index 0f4cab8..69d4167 100644 --- a/Console/CONSOLE.ASM +++ b/Console/CONSOLE.ASM @@ -50,6 +50,12 @@ LF EQU 10 ORG org_addr START: + LD HL,WORK_BUFFERS + LD DE,WORK_BUFFERS+1 + LD BC,BUFFERS_STRUCT-1 + LD (HL),0 + LDIR + ;INIT LD A,(IX-1) LD (TASKX),A @@ -57,12 +63,6 @@ START: CALL CRLF CALL GETPATH POP IX - - LD HL,WORK_BUFFERS - LD DE,WORK_BUFFERS+1 - LD BC,BUFFERS_STRUCT-1 - LD (HL),0 - LDIR ; CALL GET_CMD @@ -157,7 +157,7 @@ B_ALL_P POP HL LD C,Dss.Open RST ToDSS ;R10 - CALL Restore_Screen + CALL Restore_Screen ;R10 RET C LD (BAT_FM),A @@ -191,8 +191,8 @@ ADDBAT PUSH DE LD A,L LD (CMDLINE-1),A CALL CMDMODE - LD C,Dss.Close LD A,(BAT_FM) + LD C,Dss.Close RST ToDSS RET @@ -252,7 +252,7 @@ READBAT LD HL,BATBUFF LD (BAT_LEN),A RET -CMDMODE XOR A +CMDMODE: XOR A LD (POSIT),A CALL EVALCMD ;R05 LD IX,CMDLINE-2 @@ -1077,11 +1077,11 @@ YPS: LD DE,DTA LD HL,SER_NUM LD DE,PRM2 CALL PUTPRM - ;CALL GETPATH + CALL GETPATH LD HL,PATHF LD DE,PRM3 - ;CALL PUTPRM - call copy_string ; скопир. строку (с нулем) + CALL PUTPRM + //call copy_string ; скопир. строку (с нулем) LD DE,DIR1MSG CALL MESSAGE @@ -1523,6 +1523,7 @@ SIZEBFF DB "0 000 000 000",0,0 ;!FIXIT лучше такую функцию в DSS пихнуть ; прочитать BPB диска +/* read_disk_info: .disk+1: ld a,0 ; сохр. номер диска ld c,Dss.DRV.Open ; open device @@ -1616,7 +1617,7 @@ volume_label: inc de djnz $-2 ret - +*/ ; Вывод HL в hex-формате ; de=буфер ; hl=число @@ -1815,12 +1816,12 @@ PUTPRMA LD A,(HL) ;!FIXIT заменить на PUTPRMA с выставлением перед вызовом BC = 255 например ; Скопир. строку (с нулем) ; (hl) -> (de) -copy_string: - ld a,(hl) - ldi - or a - jr nz,copy_string - ret +//copy_string: +// ld a,(hl) +// ldi +// or a +// jr nz,copy_string +// ret PRINTZ LD A,(HL) @@ -1853,7 +1854,8 @@ ROOT DB '\',0 ALLFS DB "*.*",0 -SER_NUM DB "XXXX-XXXX",0 +SER_NUM DB "C37F-73AB",0 +//SER_NUM DB "XXXX-XXXX",0 EXTBF BLOCK 4,0 diff --git a/DSS/INTMOUSE.ASM b/DSS/INTMOUSE.ASM index 78c1c0d..fe55643 100644 --- a/DSS/INTMOUSE.ASM +++ b/DSS/INTMOUSE.ASM @@ -155,11 +155,14 @@ M_RESR LD A,DSS_Error.mouse.INVALID_COMMAND SCF RET +;!TODO на биос. MS_INIT DI - LD A,85 - OUT (#10),A - LD A,45 - OUT (#10),A + ;!TEST mouse + ;LD A,85 + ;OUT (#10),A + ;LD A,45 + ;OUT (#10),A + ; XOR A ;LD A,0 OUT (CMOUSE),A INC A ;LD A,1 @@ -172,12 +175,23 @@ MS_INIT DI OUT (CMOUSE),A LD A,4 OUT (CMOUSE),A - LD A,#47 + ;!TEST mouse + LD A,#47 + ;LD A,#44 + ; OUT (CMOUSE),A LD A,5 OUT (CMOUSE),A LD A,#E0 OUT (CMOUSE),A + + ;!TEST mouse + LD A,85 + OUT (Z84.CTC.Ch_0),A + LD A,45 + OUT (Z84.CTC.Ch_0),A + ; + EI XOR A RET @@ -381,7 +395,7 @@ MOUSET LD (REST_XT+1),HL ; DI ; - LD A,#54 + LD A,#54 ;!HARDCODE video page OUT (SLOT1),A ; LD A,D @@ -415,9 +429,9 @@ MOUSET LD (REST_XT+1),HL OUT (PORT_Y),A RET -RESTORT -REST_XT LD HL,#0000 -REST_YT LD DE,#0000 +RESTORT: +REST_XT: LD HL,#0000 +REST_YT: LD DE,#0000 ;Y SRL D RR E @@ -479,7 +493,7 @@ RESTORG IN A,(SLOT3) IN A,(PORT_Y) LD C,A PUSH BC - LD A,#50 + LD A,#50 ;!HARDCODE videopage OUT (SLOT3),A REST_X LD HL,0 REST_Y LD DE,0 @@ -519,15 +533,15 @@ RS003 POP BC ;HL/DE - X/Y -MOUSE LD A,(MODE_M) +MOUSE: LD A,(MODE_M) LD (RESTORE.sw),A BIT 7,A JP Z,MOUSET -MOUSEG CP #82 ;640x256x16 +MOUSEG: CP #82 ;640x256x16 JR NZ,NOFX SRL H RR L -NOFX LD IX,M_IMAGE +NOFX: LD IX,M_IMAGE LD A,(M_XSIZE) LD C,A LD B,0 @@ -552,12 +566,12 @@ NOFX LD IX,M_IMAGE LD B,0 LD A,(M_YSIZE) SUB E -SKIPMY ADD IX,BC +SKIPMY: ADD IX,BC DEC E JR NZ,SKIPMY LD C,A LD (REALYS),BC -GOODY LD BC,(XHOT_SP) +GOODY: LD BC,(XHOT_SP) AND A SBC HL,BC JR NC,GOODX @@ -572,7 +586,7 @@ GOODY LD BC,(XHOT_SP) LD L,A LD (REALXS),HL LD HL,0 -GOODX LD (REST_X+1),HL +GOODX: LD (REST_X+1),HL LD (REST_Y+1),DE PUSH HL @@ -581,7 +595,7 @@ GOODX LD (REST_X+1),HL IN A,(PORT_Y) LD L,A EX (SP),HL - LD A,#5C + LD A,#5C ;!HARDCODE videopage OUT (SLOT3),A LD A,E EX AF,AF' @@ -603,7 +617,7 @@ MS002 LD BC,(SKIPXF) LD BC,(REALXS) OUT (PORT_Y),A EX AF,AF' - ;USH DE + ;PUSH DE LD (PUSH_DE+1),DE LDIR PUSH_DE LD DE,#0000 diff --git a/DSS/build.txt b/DSS/build.txt index 9d60796..ca7bf83 100644 --- a/DSS/build.txt +++ b/DSS/build.txt @@ -1 +1 @@ -11 \ No newline at end of file +13 \ No newline at end of file diff --git a/Shared_Includes b/Shared_Includes index eb8e552..512ed76 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit eb8e55262317fea366bfb6b7d834dde90ff7307b +Subproject commit 512ed76395d10278e52e97d941971fc2079f1968