bug fix init mouse + redraw cursor
This commit is contained in:
saintfrater
parent
fdea690f53
commit
ab52449591
5 changed files with 348 additions and 397 deletions
|
|
@ -34,7 +34,7 @@
|
|||
%define I8042_CMD_EN_AUX 0xA8
|
||||
%define I8042_CMD_RD_CBYTE 0x20
|
||||
%define I8042_CMD_WR_CBYTE 0x60
|
||||
%define I8042_CMD_DIS_KBD 0xAD
|
||||
%define I8042_CMD_DIS_KBD 0xAD
|
||||
%define I8042_CMD_DIS_MOUSE 0xA7
|
||||
%define I8042_CMD_WRITE_AUX 0xD4
|
||||
|
||||
|
|
@ -43,30 +43,30 @@
|
|||
;
|
||||
; ------------------------------------------------------------
|
||||
mouse_reset:
|
||||
mov ax, BDA_DATA_SEG
|
||||
mov fs,ax
|
||||
mov ax, BDA_DATA_SEG
|
||||
mov fs,ax
|
||||
|
||||
; effacer les variables du drivers
|
||||
mov byte [fs:BDA_MOUSE + mouse.idx],0
|
||||
mov dword [fs:BDA_MOUSE + mouse.buffer],0
|
||||
mov byte [fs:BDA_MOUSE + mouse.packetlen],3 ; 3 bytes par défaut
|
||||
mov byte [fs:BDA_MOUSE + mouse.status],0
|
||||
; effacer les variables du drivers
|
||||
mov byte [fs:BDA_MOUSE + mouse.idx],0
|
||||
mov dword [fs:BDA_MOUSE + mouse.buffer],0
|
||||
mov byte [fs:BDA_MOUSE + mouse.packetlen],3 ; 3 bytes par défaut
|
||||
mov byte [fs:BDA_MOUSE + mouse.status],0
|
||||
|
||||
mov word [fs:BDA_MOUSE + mouse.x],320 ; vous pouvez aussi préciser le centre
|
||||
mov word [fs:BDA_MOUSE + mouse.y],100 ; vous pouvez aussi préciser le centre
|
||||
mov word [fs:BDA_MOUSE + mouse.x],320 ; vous pouvez aussi préciser le centre
|
||||
mov word [fs:BDA_MOUSE + mouse.y],100 ; vous pouvez aussi préciser le centre
|
||||
|
||||
mov byte [fs:BDA_MOUSE + mouse.cur_visible], 1
|
||||
mov word [fs:BDA_MOUSE + mouse.cur_x], 0
|
||||
mov word [fs:BDA_MOUSE + mouse.cur_y], 0
|
||||
mov byte [fs:BDA_MOUSE + mouse.cur_drawing], 0
|
||||
mov byte [fs:BDA_MOUSE + mouse.cur_visible], 1
|
||||
mov word [fs:BDA_MOUSE + mouse.cur_x], 0
|
||||
mov word [fs:BDA_MOUSE + mouse.cur_y], 0
|
||||
mov byte [fs:BDA_MOUSE + mouse.cur_drawing], 0
|
||||
|
||||
mov ax, cs
|
||||
mov word [fs:BDA_MOUSE + mouse.cur_seg], ax
|
||||
mov word [fs:BDA_MOUSE + mouse.cur_ofs], mouse_arrow
|
||||
mov ax, cs
|
||||
mov word [fs:BDA_MOUSE + mouse.cur_seg], ax
|
||||
mov word [fs:BDA_MOUSE + mouse.cur_ofs], mouse_arrow
|
||||
|
||||
; experiemntal
|
||||
mov word [fs:BDA_MOUSE + mouse.wheel],0
|
||||
ret
|
||||
; experiemntal
|
||||
mov byte [fs:BDA_MOUSE + mouse.wheel],0
|
||||
ret
|
||||
|
||||
; ------------------------------------------------------------
|
||||
; initialise le i8042 keyboard and mouse (PS/2)
|
||||
|
|
@ -74,71 +74,72 @@ mouse_reset:
|
|||
; on envoit les commandes RESET/DEFAULT/STREAM
|
||||
; ------------------------------------------------------------
|
||||
mouse_init:
|
||||
push ds
|
||||
push ax
|
||||
; reset des valeurs internes
|
||||
call mouse_reset
|
||||
cli
|
||||
call ps2_wait_ready_write
|
||||
mov al, I8042_CMD_DIS_KBD ; Disable Keyboard
|
||||
out i8042_PS2_CTRL, al
|
||||
call ps2_wait_ready_write
|
||||
mov al, I8042_CMD_DIS_MOUSE ; Disable Mouse
|
||||
out i8042_PS2_CTRL, al
|
||||
; Vider tout ce qui traîne
|
||||
call ps2_flush_output
|
||||
; Activer le port souris (AUX)
|
||||
call ps2_wait_ready_write
|
||||
mov al, I8042_CMD_EN_AUX
|
||||
out i8042_PS2_CTRL, al
|
||||
; Lire command byte
|
||||
call ps2_wait_ready_write
|
||||
mov al, I8042_CMD_RD_CBYTE
|
||||
out i8042_PS2_CTRL, al
|
||||
push ds
|
||||
push ax
|
||||
; reset des valeurs internes
|
||||
call mouse_reset
|
||||
cli
|
||||
call ps2_wait_ready_write
|
||||
mov al, I8042_CMD_DIS_KBD ; Disable Keyboard
|
||||
out i8042_PS2_CTRL, al
|
||||
call ps2_wait_ready_write
|
||||
mov al, I8042_CMD_DIS_MOUSE ; Disable Mouse
|
||||
out i8042_PS2_CTRL, al
|
||||
; Vider tout ce qui traîne
|
||||
call ps2_flush_output
|
||||
; Activer le port souris (AUX)
|
||||
call ps2_wait_ready_write
|
||||
mov al, I8042_CMD_EN_AUX
|
||||
out i8042_PS2_CTRL, al
|
||||
; Lire command byte
|
||||
call ps2_wait_ready_write
|
||||
mov al, I8042_CMD_RD_CBYTE
|
||||
out i8042_PS2_CTRL, al
|
||||
|
||||
call ps2_read ; AL = command byte
|
||||
; Activer IRQ12 (bit 1)
|
||||
or al, 02h
|
||||
mov ah, al
|
||||
; Réécrire command byte (commande 0x60 envoyée à 0x64)
|
||||
call ps2_wait_ready_write
|
||||
mov al, I8042_CMD_WR_CBYTE
|
||||
out i8042_PS2_CTRL, al
|
||||
call ps2_wait_ready_write
|
||||
mov al, ah
|
||||
out i8042_PS2_DATA, al
|
||||
call ps2_flush_output
|
||||
; --- Reset
|
||||
; réponse attendue : 0xAA, [ID]
|
||||
mov bl, MOUSE_CMD_RESET
|
||||
call mouse_sendcmd
|
||||
call ps2_read ; 0xAA attendu (self-test OK)
|
||||
call ps2_read ; ID (souvent 0x00)
|
||||
; --- Default
|
||||
mov bl, MOUSE_CMD_DEFAULT
|
||||
call mouse_sendcmd
|
||||
call ps2_read ; AL = command byte
|
||||
; Activer IRQ12 (bit 1)
|
||||
or al, 02h
|
||||
mov ah, al
|
||||
; Réécrire command byte (commande 0x60 envoyée à 0x64)
|
||||
call ps2_wait_ready_write
|
||||
mov al, I8042_CMD_WR_CBYTE
|
||||
out i8042_PS2_CTRL, al
|
||||
call ps2_wait_ready_write
|
||||
mov al, ah
|
||||
out i8042_PS2_DATA, al
|
||||
call ps2_flush_output
|
||||
; --- Reset
|
||||
; réponse attendue : 0xAA, [ID]
|
||||
mov bl, MOUSE_CMD_RESET
|
||||
call mouse_sendcmd
|
||||
call ps2_read ; 0xAA attendu (self-test OK)
|
||||
call ps2_read ; ID (souvent 0x00)
|
||||
; --- Default
|
||||
mov bl, MOUSE_CMD_DEFAULT
|
||||
call mouse_sendcmd
|
||||
|
||||
; --- streaming
|
||||
mov bl, MOUSE_EN_STREAM
|
||||
call mouse_sendcmd
|
||||
; --- streaming
|
||||
mov bl, MOUSE_EN_STREAM
|
||||
call mouse_sendcmd
|
||||
|
||||
; détecter le packet size (3/4 bytes)
|
||||
call mouse_detect_packet_len
|
||||
; installer ISR IRQ12 (INT 74h)
|
||||
mov ax,cs
|
||||
mov dx,ax
|
||||
mov bx, isr_mouse_handler
|
||||
mov ax, i8259_SLAVE_INT ; base offset IRQ8
|
||||
add ax,4 ; IRQ 12
|
||||
call ivt_setvector
|
||||
; enable IRQ 1
|
||||
mov ah,IRQ_ENABLED
|
||||
mov al, 12
|
||||
call pic_set_irq_mask
|
||||
sti
|
||||
pop ax
|
||||
pop ds
|
||||
ret
|
||||
|
||||
; détecter le packet size (3/4 bytes)
|
||||
call mouse_detect_packet_len
|
||||
; installer ISR IRQ12 (INT 74h)
|
||||
mov ax,cs
|
||||
mov dx,ax
|
||||
mov bx, isr_mouse_handler
|
||||
mov ax, i8259_SLAVE_INT ; base offset IRQ8
|
||||
add ax,4 ; IRQ 12
|
||||
call ivt_setvector
|
||||
; enable IRQ 1
|
||||
mov ah,IRQ_ENABLED
|
||||
mov al, 12
|
||||
call pic_set_irq_mask
|
||||
sti
|
||||
pop ax
|
||||
pop ds
|
||||
ret
|
||||
; ------------------------------------------------------------
|
||||
; detect la taille du "payload" de la souris.
|
||||
;
|
||||
|
|
@ -146,42 +147,42 @@ mouse_init:
|
|||
;
|
||||
; ------------------------------------------------------------
|
||||
mouse_detect_packet_len:
|
||||
mov ax, BDA_DATA_SEG
|
||||
mov fs,ax
|
||||
mov ax, BDA_DATA_SEG
|
||||
mov fs,ax
|
||||
|
||||
mov byte [fs:BDA_MOUSE + mouse.packetlen], 3
|
||||
mov byte [fs:BDA_MOUSE + mouse.packetlen], 3
|
||||
|
||||
; SET_RATE + 200
|
||||
mov bl, MOUSE_SET_RATE
|
||||
call mouse_sendcmd
|
||||
mov bl, 200
|
||||
call mouse_sendcmd
|
||||
; SET_RATE + 200
|
||||
mov bl, MOUSE_SET_RATE
|
||||
call mouse_sendcmd
|
||||
mov bl, 200
|
||||
call mouse_sendcmd
|
||||
|
||||
; SET_RATE + 100
|
||||
mov bl, MOUSE_SET_RATE
|
||||
call mouse_sendcmd
|
||||
mov bl, 100
|
||||
call mouse_sendcmd
|
||||
; SET_RATE + 100
|
||||
mov bl, MOUSE_SET_RATE
|
||||
call mouse_sendcmd
|
||||
mov bl, 100
|
||||
call mouse_sendcmd
|
||||
|
||||
; SET_RATE + 80
|
||||
mov bl, MOUSE_SET_RATE
|
||||
call mouse_sendcmd
|
||||
mov bl, 80
|
||||
call mouse_sendcmd
|
||||
; SET_RATE + 80
|
||||
mov bl, MOUSE_SET_RATE
|
||||
call mouse_sendcmd
|
||||
mov bl, 80
|
||||
call mouse_sendcmd
|
||||
|
||||
; Get ID
|
||||
mov bl, MOUSE_GET_ID
|
||||
call mouse_sendcmd
|
||||
call ps2_read ; AL = ID
|
||||
; Get ID
|
||||
mov bl, MOUSE_GET_ID
|
||||
call mouse_sendcmd
|
||||
call ps2_read ; AL = ID
|
||||
|
||||
cmp al, 03h
|
||||
je .is4
|
||||
cmp al, 04h
|
||||
je .is4
|
||||
ret
|
||||
cmp al, 03h
|
||||
je .is4
|
||||
cmp al, 04h
|
||||
je .is4
|
||||
ret
|
||||
.is4:
|
||||
mov byte [fs:BDA_MOUSE + mouse.packetlen], 4
|
||||
ret
|
||||
mov byte [fs:BDA_MOUSE + mouse.packetlen], 4
|
||||
ret
|
||||
|
||||
; ------------------------------------------------------------
|
||||
; fonction de gestion du i8042
|
||||
|
|
@ -190,41 +191,41 @@ mouse_detect_packet_len:
|
|||
|
||||
; attendre que le 8042 soit pret a recevoir de l'information
|
||||
ps2_wait_ready_write:
|
||||
push cx
|
||||
mov cx, 1000
|
||||
push cx
|
||||
mov cx, 1000
|
||||
.wait:
|
||||
in al, i8042_PS2_CTRL
|
||||
test al, 02h ; IBF
|
||||
jz .ok
|
||||
loop .wait
|
||||
in al, i8042_PS2_CTRL
|
||||
test al, 02h ; IBF
|
||||
jz .ok
|
||||
loop .wait
|
||||
.ok:
|
||||
pop cx
|
||||
ret
|
||||
pop cx
|
||||
ret
|
||||
|
||||
; attendre que le 8042 soit pret a lire de l'information
|
||||
ps2_wait_ready_read:
|
||||
.wait:
|
||||
in al, i8042_PS2_CTRL
|
||||
test al, 01h ; OBF
|
||||
jz .wait
|
||||
ret
|
||||
in al, i8042_PS2_CTRL
|
||||
test al, 01h ; OBF
|
||||
jz .wait
|
||||
ret
|
||||
|
||||
; lire de l'information depuis le 8042
|
||||
ps2_read:
|
||||
call ps2_wait_ready_read
|
||||
in al, i8042_PS2_DATA
|
||||
ret
|
||||
call ps2_wait_ready_read
|
||||
in al, i8042_PS2_DATA
|
||||
ret
|
||||
|
||||
; vide le buffer interne du 8042 (information(s) ignorée(s))
|
||||
ps2_flush_output:
|
||||
.flush:
|
||||
in al, i8042_PS2_CTRL
|
||||
test al, 01h
|
||||
jz .done
|
||||
in al, i8042_PS2_DATA
|
||||
jmp .flush
|
||||
in al, i8042_PS2_CTRL
|
||||
test al, 01h
|
||||
jz .done
|
||||
in al, i8042_PS2_DATA
|
||||
jmp .flush
|
||||
.done:
|
||||
ret
|
||||
ret
|
||||
|
||||
; ------------------------------------------------------------
|
||||
; envoye une commande souris et attends le ACK
|
||||
|
|
@ -234,23 +235,23 @@ ps2_flush_output:
|
|||
; renvoi CF=0 si ACK, CF=1 sinon
|
||||
; ------------------------------------------------------------
|
||||
mouse_sendcmd:
|
||||
call ps2_wait_ready_write
|
||||
call ps2_wait_ready_write
|
||||
|
||||
mov al, I8042_CMD_WRITE_AUX
|
||||
out i8042_PS2_CTRL, al
|
||||
mov al, I8042_CMD_WRITE_AUX
|
||||
out i8042_PS2_CTRL, al
|
||||
|
||||
call ps2_wait_ready_write
|
||||
mov al, bl
|
||||
out i8042_PS2_DATA, al
|
||||
call ps2_wait_ready_write
|
||||
mov al, bl
|
||||
out i8042_PS2_DATA, al
|
||||
|
||||
call ps2_read ; AL = réponse
|
||||
cmp al, MOUSE_ACK
|
||||
jne .bad
|
||||
clc
|
||||
ret
|
||||
call ps2_read ; AL = réponse
|
||||
cmp al, MOUSE_ACK
|
||||
jne .bad
|
||||
clc
|
||||
ret
|
||||
.bad:
|
||||
stc
|
||||
ret
|
||||
stc
|
||||
ret
|
||||
|
||||
; ------------------------------------------------------------
|
||||
; interrupt handler
|
||||
|
|
@ -271,76 +272,76 @@ mouse_sendcmd:
|
|||
; bit 7 = Y overflow
|
||||
; ------------------------------------------------------------
|
||||
isr_mouse_handler:
|
||||
; sauvegarder tout les registres
|
||||
pusha
|
||||
push ds
|
||||
; sauvegarder tout les registres
|
||||
pusha
|
||||
push ds
|
||||
|
||||
; use BDA segment
|
||||
mov ax,BDA_DATA_SEG
|
||||
mov ds,ax
|
||||
; use BDA segment
|
||||
mov ax,BDA_DATA_SEG
|
||||
mov ds,ax
|
||||
|
||||
; lire un octet depuis le contrôleur et le stocker dans le buffer
|
||||
in al, i8042_PS2_DATA ; lire octet souris
|
||||
; lire un octet depuis le contrôleur et le stocker dans le buffer
|
||||
in al, i8042_PS2_DATA ; lire octet souris
|
||||
|
||||
movzx bx, byte [BDA_MOUSE + mouse.idx]
|
||||
mov byte [BDA_MOUSE + mouse.buffer + bx], al
|
||||
inc byte [BDA_MOUSE + mouse.idx]
|
||||
movzx bx, byte [BDA_MOUSE + mouse.idx]
|
||||
mov byte [BDA_MOUSE + mouse.buffer + bx], al
|
||||
inc byte [BDA_MOUSE + mouse.idx]
|
||||
|
||||
; vérifier si le packet est complet
|
||||
mov al, [BDA_MOUSE + mouse.packetlen]
|
||||
cmp byte [BDA_MOUSE + mouse.idx], al
|
||||
jb .done_eoi
|
||||
; vérifier si le packet est complet
|
||||
mov al, [BDA_MOUSE + mouse.packetlen]
|
||||
cmp byte [BDA_MOUSE + mouse.idx], al
|
||||
jb .done_eoi
|
||||
|
||||
; packet complet, on decode les données (ou on jette si c'est incorrect)
|
||||
mov byte [BDA_MOUSE + mouse.idx], 0 ; reset de l'index de lecture
|
||||
; packet complet, on decode les données (ou on jette si c'est incorrect)
|
||||
mov byte [BDA_MOUSE + mouse.idx], 0 ; reset de l'index de lecture
|
||||
|
||||
; check bit 3 octet 0 pour assurer que le bloc est ok:
|
||||
mov al, byte [BDA_MOUSE + mouse.buffer]
|
||||
and al, 00001000b ; bit 3 = 1
|
||||
je .done_eoi ; allignement erroné
|
||||
; check bit 3 octet 0 pour assurer que le bloc est ok:
|
||||
mov al, byte [BDA_MOUSE + mouse.buffer]
|
||||
and al, 00001000b ; bit 3 = 1
|
||||
je .done_eoi ; allignement erroné
|
||||
|
||||
; debut du décodage des données
|
||||
mov bl, [BDA_MOUSE + mouse.buffer] ; status
|
||||
mov al,bl
|
||||
; --- BOUTONS (Optionnel mais recommandé) ---
|
||||
and al, 00000111b ; Bits 0, 1, 2 = Gauche, Droite, Milieu
|
||||
mov [BDA_MOUSE + mouse.status], al
|
||||
; debut du décodage des données
|
||||
mov bl, [BDA_MOUSE + mouse.buffer] ; status
|
||||
mov al,bl
|
||||
; --- BOUTONS (Optionnel mais recommandé) ---
|
||||
and al, 00000111b ; Bits 0, 1, 2 = Gauche, Droite, Milieu
|
||||
mov [BDA_MOUSE + mouse.status], al
|
||||
|
||||
xor ax,ax
|
||||
mov al, byte [BDA_MOUSE + mouse.buffer+1] ; delta X
|
||||
test bl,00010000b ; signe X
|
||||
jz .x_pos
|
||||
mov ah,0xff ; X est négatif
|
||||
xor ax,ax
|
||||
mov al, byte [BDA_MOUSE + mouse.buffer+1] ; delta X
|
||||
test bl,00010000b ; signe X
|
||||
jz .x_pos
|
||||
mov ah,0xff ; X est négatif
|
||||
.x_pos:
|
||||
add [BDA_MOUSE + mouse.x], ax
|
||||
add [BDA_MOUSE + mouse.x], ax
|
||||
|
||||
xor ax,ax
|
||||
mov al, byte [BDA_MOUSE + mouse.buffer+2] ; delta Y
|
||||
test bl,00100000b ; signe Y
|
||||
jz .y_pos
|
||||
mov ah,0xff ; y est négatif
|
||||
xor ax,ax
|
||||
mov al, byte [BDA_MOUSE + mouse.buffer+2] ; delta Y
|
||||
test bl,00100000b ; signe Y
|
||||
jz .y_pos
|
||||
mov ah,0xff ; y est négatif
|
||||
.y_pos:
|
||||
sub [BDA_MOUSE + mouse.y], ax
|
||||
sub [BDA_MOUSE + mouse.y], ax
|
||||
|
||||
; check si il y a un 4eme byte a traiter
|
||||
mov al, [BDA_MOUSE + mouse.packetlen]
|
||||
cmp al,4
|
||||
jne .done_eoi
|
||||
; check si il y a un 4eme byte a traiter
|
||||
mov al, [BDA_MOUSE + mouse.packetlen]
|
||||
cmp al,4
|
||||
jne .done_eoi
|
||||
|
||||
; si packetlen = 4, gérer la molette; experimental et non fonctionnel
|
||||
movsx ax, byte [BDA_MOUSE + mouse.buffer+3] ; delta Wheel
|
||||
add word [BDA_MOUSE + mouse.wheel], ax
|
||||
; si packetlen = 4, gérer la molette; experimental et non fonctionnel
|
||||
movsx ax, byte [BDA_MOUSE + mouse.buffer+3] ; delta Wheel
|
||||
add word [BDA_MOUSE + mouse.wheel], ax
|
||||
|
||||
.done:
|
||||
; update la position du curseur sur l'écran
|
||||
; en ce moment c'est commented out (debug)
|
||||
; call gfx_cursor_move
|
||||
; update la position du curseur sur l'écran
|
||||
; en ce moment c'est commented out (debug)
|
||||
; call gfx_cursor_move
|
||||
.done_eoi:
|
||||
mov al, 0x20
|
||||
out i8259_SLAVE_CMD, al ; EOI PIC esclave
|
||||
out i8259_MASTER_CMD, al ; EOI PIC maître
|
||||
mov al, 0x20
|
||||
out i8259_SLAVE_CMD, al ; EOI PIC esclave
|
||||
out i8259_MASTER_CMD, al ; EOI PIC maître
|
||||
|
||||
; restaurer tous les registres
|
||||
pop ds
|
||||
popa
|
||||
iret
|
||||
; restaurer tous les registres
|
||||
pop ds
|
||||
popa
|
||||
iret
|
||||
Loading…
Reference in a new issue