]> Zhao Yanbai Git Server - minix.git/commitdiff
Changed Makefiles: drivers are now installed in /usr/sbin.
authorJorrit Herder <jnherder@minix3.org>
Tue, 19 Jul 2005 12:12:48 +0000 (12:12 +0000)
committerJorrit Herder <jnherder@minix3.org>
Tue, 19 Jul 2005 12:12:48 +0000 (12:12 +0000)
TTY now gets SYS_EVENT message with sigset (e.g., SIGKMESS, SIGKSTOP).

drivers/at_wini/Makefile
drivers/dpeth/Makefile
drivers/floppy/Makefile
drivers/fxp/Makefile
drivers/log/Makefile
drivers/memory/Makefile
drivers/printer/Makefile
drivers/rtl8139/Makefile
drivers/tty/Makefile
drivers/tty/keyboard.c
drivers/tty/tty.c

index 173b40dc4327f37a0856df6173f5cafd16cb60c3..d1390d9782114b5fc40834b75240843734b729b6 100644 (file)
@@ -30,8 +30,8 @@ $(LIBDRIVER):
        cd $d/libdriver && $(MAKE) 
 
 # install with other drivers
-install:       /usr/sbin/drivers/$(DRIVER)
-/usr/sbin/drivers/$(DRIVER):   $(DRIVER)
+install:       /usr/sbin/$(DRIVER)
+/usr/sbin/$(DRIVER):   $(DRIVER)
        install -o root -cs $? $@
 
 # clean up local files
index d404db5f3035ff074792ac5b85768bb40e5a78ec..09053aa2aa8f064ca8ef3486dc574a3b82c75915 100644 (file)
@@ -2,6 +2,10 @@
 ##  Makefile for ISA ethernet drivers  May  02, 2000
 ##
 ##  $Log$
+##  Revision 1.2  2005/07/19 12:12:47  jnherder
+##  Changed Makefiles: drivers are now installed in /usr/sbin.
+##  TTY now gets SYS_EVENT message with sigset (e.g., SIGKMESS, SIGKSTOP).
+##
 ##  Revision 1.1  2005/06/29 10:16:46  beng
 ##  Import of dpeth 3c501/3c509b/.. ethernet driver by
 ##  Giovanni Falzoni <fgalzoni@inwind.it>.
@@ -34,8 +38,8 @@ $(DRIVER):    $(OBJS)
        install -S 4kw $(DRIVER)
 
 ##  Install with other drivers
-install:       /usr/sbin/drivers/$(DRIVER)
-/usr/sbin/drivers/$(DRIVER):   $(DRIVER)
+install:       /usr/sbin/$(DRIVER)
+/usr/sbin/$(DRIVER):   $(DRIVER)
        install -o root -cs $? $@
 
 ##  Generate dependencies
index 9c11fe85a086332532079768e5a7773fb8878ac1..5110219db7b9d162fe3bd5c3a6d6c26c0994745b 100644 (file)
@@ -29,8 +29,8 @@ $(LIBDRIVER):
        cd $d/libdriver && $(MAKE) 
 
 # install with other drivers
-install:       /usr/sbin/drivers/$(DRIVER)
-/usr/sbin/drivers/$(DRIVER):   $(DRIVER)
+install:       /usr/sbin/$(DRIVER)
+/usr/sbin/$(DRIVER):   $(DRIVER)
        install -o root -cs $? $@
 
 # clean up local files
index afafd050822fae183ca3ad3e9ac64cdecf8fa51d..d53aa934ba4c2c717865c2b0583f0dfeca28e635 100644 (file)
@@ -28,8 +28,8 @@ $(LIBPCI):
        cd $d/libpci && $(MAKE) 
 
 # install with other drivers
-install:       /usr/sbin/drivers/$(DRIVER)
-/usr/sbin/drivers/$(DRIVER):   $(DRIVER)
+install:       /usr/sbin/$(DRIVER)
+/usr/sbin/$(DRIVER):   $(DRIVER)
        install -o root -cs $? $@
 
 # clean up local files
index 80416e588a066c5fd07ae2fbb9abe0f53d819603..0f4855784df2673317e22c2a47e12db33c67c872 100644 (file)
@@ -29,8 +29,8 @@ $(LIBDRIVER):
        cd $d/libdriver && $(MAKE) 
 
 # install with other drivers
-install:       /usr/sbin/drivers/$(DRIVER)
-/usr/sbin/drivers/$(DRIVER):   $(DRIVER)
+install:       /usr/sbin/$(DRIVER)
+/usr/sbin/$(DRIVER):   $(DRIVER)
        install -o root -cs $? $@
 
 # clean up local files
index 4501752d8f4d78a7786294c70a076f8660ea069d..b696edba7e2d30620b79c9c8e59c01d3e87e6ebe 100644 (file)
@@ -36,8 +36,8 @@ aes/rijndael_alg.o:
        $(CC) -c -o $@ aes/rijndael_alg.c
 
 # install with other drivers
-install:       /usr/sbin/drivers/$(DRIVER)
-/usr/sbin/drivers/$(DRIVER):   $(DRIVER)
+install:       /usr/sbin/$(DRIVER)
+/usr/sbin/$(DRIVER):   $(DRIVER)
        install -o root -cs $? $@
 
 # clean up local files
index c9b4b536e41f6cb7240c58c0a41445d93cd7c4dc..09f4757702e54708747a697eca4855276fc65e81 100644 (file)
@@ -24,8 +24,8 @@ $(DRIVER):    $(OBJ)
 #      install -S 64w $(DRIVER)
 
 # install with other drivers
-install:       /usr/sbin/drivers/$(DRIVER)
-/usr/sbin/drivers/$(DRIVER):   $(DRIVER)
+install:       /usr/sbin/$(DRIVER)
+/usr/sbin/$(DRIVER):   $(DRIVER)
        install -o root -c $? $@
 #      install -o root -cs $? $@
 
index adcba51bc7bd761e66a1b369d440b00d2c143406..24b6c4ec03c7a2daa3b0ebb5ac51ba4697a89f10 100644 (file)
@@ -30,8 +30,8 @@ $(PCI):
        cd $d/libpci && $(MAKE) 
 
 # install with other drivers
-install:       /usr/sbin/drivers/$(DRIVER)
-/usr/sbin/drivers/$(DRIVER):   $(DRIVER)
+install:       /usr/sbin/$(DRIVER)
+/usr/sbin/$(DRIVER):   $(DRIVER)
        install -o root -cs $? $@
 
 # clean up local files
index dac291cec5472daab9fdcd8e55d2fd729f59d22f..0229b2191a167240b5944408f6a6d8c960e6c67d 100644 (file)
@@ -26,9 +26,9 @@ $(DRIVER):    $(OBJ)
        install -S 256w $(DRIVER)
 
 # install with other drivers
-install:       /usr/sbin/drivers/$(DRIVER)
+install:       /usr/sbin/$(DRIVER)
        cd keymaps && $(MAKE) -$(MAKEFLAGS) $@
-/usr/sbin/drivers/$(DRIVER):   $(DRIVER)
+/usr/sbin/$(DRIVER):   $(DRIVER)
        install -o root -cs $? $@
 
 # clean up local files
index 138a1aa88d8758ec77e43f06cd6a2cf870168078..6d65507e5e77cda92034cfeaeefcbfed0d579acd 100644 (file)
@@ -629,7 +629,7 @@ message *m;                 /* request message to TTY */
         */
        while (nb_receive(ANY, m) == OK) {
                switch(m->m_type) {
-               case NEW_KMESS:    do_new_kmess(m);     break;
+               case SYS_EVENT:    do_new_kmess(m);     break;
                case DIAGNOSTICS:  do_diagnostics(m);   break;
                default:        ;       /* do nothing */ 
                }
index b935bf53667bf959ab239c71dc22b2f4944b7011..cd67d2de393a6be346a6f137c358cd47f04bb7d5 100644 (file)
@@ -204,9 +204,18 @@ PUBLIC void main(void)
                expire_timers();        /* run watchdogs of expired timers */
                continue;               /* contine to check for events */
        }
-       case NEW_KMESS:                 /* new kernel message is available */
-               do_new_kmess(&tty_mess);
+       case SYS_EVENT: {               /* new kernel message is available */
+               sigset_t sigset = (sigset_t) tty_mess.NOTIFY_ARG;
+               if (sigismember(&sigset, SIGKMESS)) {
+                       do_new_kmess(&tty_mess);
+               } else if (sigismember(&sigset, SIGTERM)) {
+                       cons_stop();    /* first switch to primary console */
+               } else if (sigismember(&sigset, SIGKSTOP)) {
+                       cons_stop();            /* switch to primary console */
+                       do_panic_dumps(&tty_mess);      
+               }
                continue;
+       }
        case HARD_STOP: {               /* MINIX is going down */
                static int stop = 0;    /* expect two HARD_STOP messages */
                if (! stop++) {