From 6c3d19779f60a339aed9165f4ae38266b471f1eb Mon Sep 17 00:00:00 2001 From: hidnplayr Date: Tue, 3 Dec 2013 20:29:24 +0000 Subject: [PATCH] loaddrv program: silently load the driver (driver name must be given as parameter). Replaces commouse program. git-svn-id: svn://kolibrios.org@4322 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/eng/Makefile | 2 +- data/eng/settings/autorun.dat | 2 +- data/et/Makefile | 2 +- data/et/settings/autorun.dat | 2 +- data/it/Makefile | 2 +- data/it/settings/autorun.dat | 2 +- data/rus/Makefile | 2 +- data/rus/settings/autorun.dat | 2 +- data/sp/Makefile | 2 +- data/sp/settings/autorun.dat | 2 +- programs/system/commouse/trunk/commouse.asm | 26 ----------------- programs/system/commouse/trunk/makefile | 16 ----------- programs/system/loaddrv/loaddrv.asm | 31 +++++++++++++++++++++ 13 files changed, 41 insertions(+), 52 deletions(-) delete mode 100644 programs/system/commouse/trunk/commouse.asm delete mode 100644 programs/system/commouse/trunk/makefile create mode 100644 programs/system/loaddrv/loaddrv.asm diff --git a/data/eng/Makefile b/data/eng/Makefile index 85221ea823..2ef74e766c 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -52,7 +52,7 @@ FASM_PROGRAMS:=\ calc:CALC:$(PROGS)/other/calc/trunk/calc.asm \ calendar:CALENDAR:$(PROGS)/system/calendar/trunk/calendar.asm \ colrdial:COLRDIAL:$(PROGS)/system/colrdial/color_dialog.asm \ - commouse:COMMOUSE:$(PROGS)/system/commouse/trunk/commouse.asm \ + loaddrv:LOADDRV:$(PROGS)/system/loaddrv/loaddrv.asm \ cpu:CPU:$(PROGS)/system/cpu/trunk/cpu.asm \ cpuid:CPUID:$(PROGS)/system/cpuid/trunk/CPUID.ASM \ desktop:DESKTOP:$(PROGS)/system/desktop/trunk/desktop.asm \ diff --git a/data/eng/settings/autorun.dat b/data/eng/settings/autorun.dat index 7ea2ec0b50..c1ecab34d4 100644 --- a/data/eng/settings/autorun.dat +++ b/data/eng/settings/autorun.dat @@ -4,7 +4,7 @@ # If delay is negative, wait for termination of the spawned process. Otherwise, simply wait # #/SYS/CROPFLAT "XS800 YS480" 1 # set limits of screen -#/SYS/COMMOUSE "" 1 # COM mice detector +#/SYS/LOADDRV "COMMOUSE" 1 # COM mice detector #/SYS/DEVELOP/BOARD "" 1 # Load DEBUG board #/SYS/refrscrn "" 1 # Refresh screen /SYS/NETWORK/NETCFG A 1 # diff --git a/data/et/Makefile b/data/et/Makefile index 1a24e7c418..40e6c8e9d9 100644 --- a/data/et/Makefile +++ b/data/et/Makefile @@ -52,7 +52,7 @@ FASM_PROGRAMS:=\ calc:CALC:$(PROGS)/other/calc/trunk/calc.asm \ calendar:CALENDAR:$(PROGS)/system/calendar/trunk/calendar.asm \ colrdial:COLRDIAL:$(PROGS)/system/colrdial/color_dialog.asm \ - commouse:COMMOUSE:$(PROGS)/system/commouse/trunk/commouse.asm \ + loaddrv:LOADDRV:$(PROGS)/system/loaddrv/loaddrv.asm \ cpu:CPU:$(PROGS)/system/cpu/trunk/cpu.asm \ cpuid:CPUID:$(PROGS)/system/cpuid/trunk/CPUID.ASM \ desktop:DESKTOP:$(PROGS)/system/desktop/trunk/desktop.asm \ diff --git a/data/et/settings/autorun.dat b/data/et/settings/autorun.dat index 7ea2ec0b50..49b68da817 100644 --- a/data/et/settings/autorun.dat +++ b/data/et/settings/autorun.dat @@ -4,7 +4,7 @@ # If delay is negative, wait for termination of the spawned process. Otherwise, simply wait # #/SYS/CROPFLAT "XS800 YS480" 1 # set limits of screen -#/SYS/COMMOUSE "" 1 # COM mice detector +#/SYS/LOADDRV "COMMOUSE" 1 # COM mice detector #/SYS/DEVELOP/BOARD "" 1 # Load DEBUG board #/SYS/refrscrn "" 1 # Refresh screen /SYS/NETWORK/NETCFG A 1 # diff --git a/data/it/Makefile b/data/it/Makefile index 7bede68538..ede16d7f59 100644 --- a/data/it/Makefile +++ b/data/it/Makefile @@ -52,7 +52,7 @@ FASM_PROGRAMS:=\ calc:CALC:$(PROGS)/other/calc/trunk/calc.asm \ calendar:CALENDAR:$(PROGS)/system/calendar/trunk/calendar.asm \ colrdial:COLRDIAL:$(PROGS)/system/colrdial/color_dialog.asm \ - commouse:COMMOUSE:$(PROGS)/system/commouse/trunk/commouse.asm \ + loaddrv:LOADDRV:$(PROGS)/system/loaddrv/loaddrv.asm \ cpu:CPU:$(PROGS)/system/cpu/trunk/cpu.asm \ cpuid:CPUID:$(PROGS)/system/cpuid/trunk/CPUID.ASM \ desktop:DESKTOP:$(PROGS)/system/desktop/trunk/desktop.asm \ diff --git a/data/it/settings/autorun.dat b/data/it/settings/autorun.dat index 7ea2ec0b50..4522a0a084 100644 --- a/data/it/settings/autorun.dat +++ b/data/it/settings/autorun.dat @@ -4,7 +4,7 @@ # If delay is negative, wait for termination of the spawned process. Otherwise, simply wait # #/SYS/CROPFLAT "XS800 YS480" 1 # set limits of screen -#/SYS/COMMOUSE "" 1 # COM mice detector +#/SYS/LOADDRV "COMMOUSE" 1 # COM mice detector #/SYS/DEVELOP/BOARD "" 1 # Load DEBUG board #/SYS/refrscrn "" 1 # Refresh screen /SYS/NETWORK/NETCFG A 1 # diff --git a/data/rus/Makefile b/data/rus/Makefile index 89bd7ec09d..ff4cfcb6f8 100644 --- a/data/rus/Makefile +++ b/data/rus/Makefile @@ -52,7 +52,7 @@ FASM_PROGRAMS:=\ calc:CALC:$(PROGS)/other/calc/trunk/calc.asm \ calendar:CALENDAR:$(PROGS)/system/calendar/trunk/calendar.asm \ colrdial:COLRDIAL:$(PROGS)/system/colrdial/color_dialog.asm \ - commouse:COMMOUSE:$(PROGS)/system/commouse/trunk/commouse.asm \ + loaddrv:LOADDRV:$(PROGS)/system/loaddrv/loaddrv.asm \ cpu:CPU:$(PROGS)/system/cpu/trunk/cpu.asm \ cpuid:CPUID:$(PROGS)/system/cpuid/trunk/CPUID.ASM \ desktop:DESKTOP:$(PROGS)/system/desktop/trunk/desktop.asm \ diff --git a/data/rus/settings/autorun.dat b/data/rus/settings/autorun.dat index 7ea2ec0b50..4522a0a084 100644 --- a/data/rus/settings/autorun.dat +++ b/data/rus/settings/autorun.dat @@ -4,7 +4,7 @@ # If delay is negative, wait for termination of the spawned process. Otherwise, simply wait # #/SYS/CROPFLAT "XS800 YS480" 1 # set limits of screen -#/SYS/COMMOUSE "" 1 # COM mice detector +#/SYS/LOADDRV "COMMOUSE" 1 # COM mice detector #/SYS/DEVELOP/BOARD "" 1 # Load DEBUG board #/SYS/refrscrn "" 1 # Refresh screen /SYS/NETWORK/NETCFG A 1 # diff --git a/data/sp/Makefile b/data/sp/Makefile index 0f6c42ca75..760606591f 100644 --- a/data/sp/Makefile +++ b/data/sp/Makefile @@ -52,7 +52,7 @@ FASM_PROGRAMS:=\ calc:CALC:$(PROGS)/other/calc/trunk/calc.asm \ calendar:CALENDAR:$(PROGS)/system/calendar/trunk/calendar.asm \ colrdial:COLRDIAL:$(PROGS)/system/colrdial/color_dialog.asm \ - commouse:COMMOUSE:$(PROGS)/system/commouse/trunk/commouse.asm \ + loaddrv:LOADDRV:$(PROGS)/system/loaddrv/loaddrv.asm \ cpu:CPU:$(PROGS)/system/cpu/trunk/cpu.asm \ cpuid:CPUID:$(PROGS)/system/cpuid/trunk/CPUID.ASM \ desktop:DESKTOP:$(PROGS)/system/desktop/trunk/desktop.asm \ diff --git a/data/sp/settings/autorun.dat b/data/sp/settings/autorun.dat index 7ea2ec0b50..4522a0a084 100644 --- a/data/sp/settings/autorun.dat +++ b/data/sp/settings/autorun.dat @@ -4,7 +4,7 @@ # If delay is negative, wait for termination of the spawned process. Otherwise, simply wait # #/SYS/CROPFLAT "XS800 YS480" 1 # set limits of screen -#/SYS/COMMOUSE "" 1 # COM mice detector +#/SYS/LOADDRV "COMMOUSE" 1 # COM mice detector #/SYS/DEVELOP/BOARD "" 1 # Load DEBUG board #/SYS/refrscrn "" 1 # Refresh screen /SYS/NETWORK/NETCFG A 1 # diff --git a/programs/system/commouse/trunk/commouse.asm b/programs/system/commouse/trunk/commouse.asm deleted file mode 100644 index 6f2705f09b..0000000000 --- a/programs/system/commouse/trunk/commouse.asm +++ /dev/null @@ -1,26 +0,0 @@ -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: diff --git a/programs/system/commouse/trunk/makefile b/programs/system/commouse/trunk/makefile deleted file mode 100644 index a5e17d9d96..0000000000 --- a/programs/system/commouse/trunk/makefile +++ /dev/null @@ -1,16 +0,0 @@ -#!gmake - - -# Macro -FASM=/opt/bin/fasm -KPACK=/opt/bin/kpack -LANG=lang.inc -FILE=commouse -SOURCE=${FILE}.asm -OUT=${FILE}.bin - -en: - ${FASM} ${SOURCE} ${OUT} - -clean: - rm -f ${LANG} ${OUT} diff --git a/programs/system/loaddrv/loaddrv.asm b/programs/system/loaddrv/loaddrv.asm new file mode 100644 index 0000000000..b50e2af855 --- /dev/null +++ b/programs/system/loaddrv/loaddrv.asm @@ -0,0 +1,31 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; ;; +;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;; +;; Distributed under terms of the GNU General Public License ;; +;; ;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +format binary as "" + +use32 + db 'MENUET01' + dd 1 + dd start + dd i_end + dd mem + dd mem + dd path, 0 + +start: + mov eax, 68 + mov ebx, 16 + mov ecx, path + int 0x40 + + mov eax, -1 + int 0x40 +i_end: + + path rb 1024 + +mem: \ No newline at end of file