From 89da5cd137f9dcf352115441e61faa1a59ea6f4f Mon Sep 17 00:00:00 2001 From: "Evgeny Grechnikov (Diamond)" Date: Fri, 5 Jun 2009 19:56:49 +0000 Subject: [PATCH] Loading COM mouse driver is moved from the kernel to application git-svn-id: svn://kolibrios.org@1106 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/data32.inc | 2 +- kernel/trunk/kernel.asm | 2 +- programs/build_all.bat | 1 + programs/system/commouse/trunk/commouse.asm | 26 +++++++++++++++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 programs/system/commouse/trunk/commouse.asm diff --git a/kernel/trunk/data32.inc b/kernel/trunk/data32.inc index 52084ccda2..74059890bf 100644 --- a/kernel/trunk/data32.inc +++ b/kernel/trunk/data32.inc @@ -90,7 +90,7 @@ AMD_str db "AuthenticAMD",0 ;szInfinity db 'INFINITY',0 szHwMouse db 'ATI2D',0 szPS2MDriver db 'PS2MOUSE',0 -szCOM_MDriver db 'COM_MOUSE',0 +;szCOM_MDriver db 'COM_MOUSE',0 szUSB db 'USB',0 szAtiHW db '/rd/1/drivers/ati2d.drv',0 diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm index 852f5205ee..d7fb18d4f8 100644 --- a/kernel/trunk/kernel.asm +++ b/kernel/trunk/kernel.asm @@ -763,7 +763,7 @@ no_lib_load: ;call detect_devices stdcall load_driver, szPS2MDriver - stdcall load_driver, szCOM_MDriver +; stdcall load_driver, szCOM_MDriver mov esi,boot_setmouse call boot_log diff --git a/programs/build_all.bat b/programs/build_all.bat index c0d5b22746..2f247e3ec3 100644 --- a/programs/build_all.bat +++ b/programs/build_all.bat @@ -58,6 +58,7 @@ echo Building system echo * fasm system\calendar\trunk\calendar.asm %BIN%\calendar fasm system\board\trunk\board.asm %BIN%\develop\board +fasm system\commouse\trunk\commouse.asm %BIN%\commouse fasm system\cpu\trunk\cpu.asm %BIN%\cpu fasm system\cpuid\trunk\cpuid.asm %BIN%\cpuid fasm system\desktop\trunk\desktop.asm %BIN%\desktop diff --git a/programs/system/commouse/trunk/commouse.asm b/programs/system/commouse/trunk/commouse.asm new file mode 100644 index 0000000000..6f2705f09b --- /dev/null +++ b/programs/system/commouse/trunk/commouse.asm @@ -0,0 +1,26 @@ +use32 + db 'MENUET01' + dd 1 + dd start + dd i_end + dd mem + dd mem + dd 0, 0 + +start: + push 68 + pop eax + push 16 + pop ebx + push drvname + pop ecx + int 0x40 + push -1 + pop eax + int 0x40 + +drvname db 'COM_MOUSE',0 +i_end: +align 16 +rb 16 +mem: