From 04437364c40de4dd12c29c604f99eca0ac353532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Hord=C3=A9?= Date: Wed, 11 Apr 2007 19:06:02 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20correction=20d'un=20bogue=20dans=20la=20?= =?UTF-8?q?fonction=20"detect"=20Suppression=20de=20l'appel=20en=20"enable?= =?UTF-8?q?a20","flatmode"=20et=20"detectvmware"=20suspect=C3=A9=20de=20ca?= =?UTF-8?q?user=20des=20plantages=20sur=20de=20vrais=20PC=20(pas=20emul?= =?UTF-8?q?=C3=A9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- noyau/systeme.asm | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/noyau/systeme.asm b/noyau/systeme.asm index f40ce49..a7e2234 100644 --- a/noyau/systeme.asm +++ b/noyau/systeme.asm @@ -99,8 +99,8 @@ suite: push eax call [cs:print],offset msg_pci_info call [cs:print],offset msg_pci_enum - xor bx,bx - xor cx,cx + xor ebx,ebx + xor ecx,ecx xor si,si searchpci: call [cs:getcardinfo],bx,cx,si,offset temp @@ -145,24 +145,25 @@ stopthis: nopci: call [cs:print],offset msg_echec2 next: - call [cs:detectvmware] - jne novirtual - call [cs:print],offset msg_vmware + ;call [cs:detectvmware] + ;jne novirtual + ;call [cs:print],offset msg_vmware novirtual: - call [cs:print],offset msg_flat - call enablea20 - call flatmode - xor ax,ax - mov fs,ax - mov esi,0100000h - mov [dword ptr fs:esi],"OKIN" + ;call [cs:print],offset msg_flat + ;call enablea20 + ;call flatmode + ;xor ax,ax + ;mov fs,ax + ;mov esi,0100000h + ;mov [dword ptr fs:esi],"OKIN" call [cs:print],offset msg_ok2 call [cs:print],offset msg_disk_init call [cs:initdrive] jc error2 call [cs:print],offset msg_ok2 + call [cs:print],offset msg_launchcommand call [cs:execfile],offset shell - + jc error2 error2: call [cs:print],offset msg_error2 call bioswaitkey @@ -189,12 +190,12 @@ msg_cpu_detect_inf db " -Fondeur : %0\l -Modele : %0\l -Revision : %u\l - msg_pci db "Detection des systemes PCI",0 msg_pci_info db " -Version : %yB.%yB\l -Numero bus max: %u\l",0 msg_pci_enum db " -Enumeration des peripheriques PCI:\l" - db " |Vendeur|Modele|Bus |Dev.|Func|Classe.Sous-classe\l",0 -msg_pci_card db " | %hW | %hW |%w|%w|%w|%0P.%0P\l",0 + db " | Vendeur | Modele |Bus |Dev.|Func|Classe.Sous-classe\l",0 +msg_pci_card db " | 0x%hW | 0x%hW |%w|%w|%w|%0P.%0P\l",0 msg_vmware db "\c04 VMWare a ete detecte !!!\c07\l",0 msg_flat db "Initialisation du Flat Real Mode\l",0 msg_disk_init db "Initialisation du pilote DISQUE\l",0 - +msg_launchcommand db "Execution du SHELL\l",0 msg_error db " [Erreur]",0dh,0ah,"",0 msg_ok db " [ Ok ]",0dh,0ah,0