. clarify panic messages in syslib about pci

. use ds_retrieve_u32 instead of _pm_findproc

diff --git a/lib/syslib/pci_attr_r16.c b/lib/syslib/pci_attr_r16.c
index 6aff1aa5a04da77ed72c6ccfe609d306e4af4952..03de6151a75d89931dd0c7d92d71aa820c6570e7 100644 (file)
--- a/lib/syslib/pci_attr_r16.c
+++ b/lib/syslib/pci_attr_r16.c
@@ -22,10 +22,10 @@ int port;
 
        r= sendrec(pci_procnr, &m);
        if (r != 0)
-               panic("pci", "pci_attr_r16: can't talk to PCI", r);
+               panic("syslib/" __FILE__, "pci_attr_r16: can't talk to PCI", r);
 
        if (m.m_type != 0)
-               panic("pci", "pci_attr_r16: got bad reply from PCI", m.m_type);
+               panic("syslib/" __FILE__, "pci_attr_r16: got bad reply from PCI", m.m_type);
 
        return m.m2_l1;
 }

diff --git a/lib/syslib/pci_attr_r32.c b/lib/syslib/pci_attr_r32.c
index aa9bd7a91f59dee288b55cd3f98def5e50df0434..0a3aefe493a062ee8aa6d4a83614ac3d4435c8c0 100644 (file)
--- a/lib/syslib/pci_attr_r32.c
+++ b/lib/syslib/pci_attr_r32.c
@@ -22,10 +22,10 @@ int port;
 
        r= sendrec(pci_procnr, &m);
        if (r != 0)
-               panic("pci", "pci_attr_r32: can't talk to PCI", r);
+               panic("syslib/" __FILE__, "pci_attr_r32: can't talk to PCI", r);
 
        if (m.m_type != 0)
-               panic("pci", "pci_attr_r32: got bad reply from PCI", m.m_type);
+               panic("syslib/" __FILE__, "pci_attr_r32: got bad reply from PCI", m.m_type);
 
        return m.m2_l1;
 }

diff --git a/lib/syslib/pci_attr_r8.c b/lib/syslib/pci_attr_r8.c
index 95f4ce27eeada08976b7c82f78095862aa6fb7e4..d08a6851ef39de31f2cb6737000362ea1558bba1 100644 (file)
--- a/lib/syslib/pci_attr_r8.c
+++ b/lib/syslib/pci_attr_r8.c
@@ -22,10 +22,10 @@ int port;
 
        r= sendrec(pci_procnr, &m);
        if (r != 0)
-               panic("pci", "pci_attr_r8: can't talk to PCI", r);
+               panic("syslib/" __FILE__, "pci_attr_r8: can't talk to PCI", r);
 
        if (m.m_type != 0)
-               panic("pci", "pci_attr_r8: got bad reply from PCI", m.m_type);
+               panic("syslib/" __FILE__, "pci_attr_r8: got bad reply from PCI", m.m_type);
 
        return m.m2_l1;
 }

diff --git a/lib/syslib/pci_attr_w16.c b/lib/syslib/pci_attr_w16.c
index 7c13ed6a114c2a56538e431c58cf0c3e6c32bf5c..a201f5c003746cea127a4a7a9840c33a39c738d0 100644 (file)
--- a/lib/syslib/pci_attr_w16.c
+++ b/lib/syslib/pci_attr_w16.c
@@ -24,9 +24,9 @@ u16_t value;
 
        r= sendrec(pci_procnr, &m);
        if (r != 0)
-               panic("pci", "pci_attr_w16: can't talk to PCI", r);
+               panic("syslib/" __FILE__, "pci_attr_w16: can't talk to PCI", r);
 
        if (m.m_type != 0)
-               panic("pci", "pci_attr_w16: got bad reply from PCI", m.m_type);
+               panic("syslib/" __FILE__, "pci_attr_w16: got bad reply from PCI", m.m_type);
 }
 

diff --git a/lib/syslib/pci_attr_w32.c b/lib/syslib/pci_attr_w32.c
index 887dd075291534fc631481f27a340b979a6548c2..775570b68849b2047f392785dfa794ad141cc6e2 100644 (file)
--- a/lib/syslib/pci_attr_w32.c
+++ b/lib/syslib/pci_attr_w32.c
@@ -24,9 +24,9 @@ u32_t value;
 
        r= sendrec(pci_procnr, &m);
        if (r != 0)
-               panic("pci", "pci_attr_w32: can't talk to PCI", r);
+               panic("syslib/" __FILE__, "pci_attr_w32: can't talk to PCI", r);
 
        if (m.m_type != 0)
-               panic("pci", "pci_attr_w32: got bad reply from PCI", m.m_type);
+               panic("syslib/" __FILE__, "pci_attr_w32: got bad reply from PCI", m.m_type);
 }
 

diff --git a/lib/syslib/pci_attr_w8.c b/lib/syslib/pci_attr_w8.c
index a764d3a51aa01b878a50b3ced8d4066e0f090b33..f4fa9eb2fcfc5e56d54b57816fa70664afe31a77 100644 (file)
--- a/lib/syslib/pci_attr_w8.c
+++ b/lib/syslib/pci_attr_w8.c
@@ -24,9 +24,9 @@ u8_t value;
 
        r= sendrec(pci_procnr, &m);
        if (r != 0)
-               panic("pci", "pci_attr_w8: can't talk to PCI", r);
+               panic("syslib/" __FILE__, "pci_attr_w8: can't talk to PCI", r);
 
        if (m.m_type != 0)
-               panic("pci", "pci_attr_w8: got bad reply from PCI", m.m_type);
+               panic("syslib/" __FILE__, "pci_attr_w8: got bad reply from PCI", m.m_type);
 }
 

diff --git a/lib/syslib/pci_del_acl.c b/lib/syslib/pci_del_acl.c
index 6a09cc30f6bdfa9d95292310b46c6b18034fe62d..3ab86db587dff1707a4c00782a03e7dfe7997094 100644 (file)
--- a/lib/syslib/pci_del_acl.c
+++ b/lib/syslib/pci_del_acl.c
@@ -6,6 +6,7 @@ pci_del_acl.c
 #include "syslib.h"
 #include <unistd.h>
 #include <minix/rs.h>
+#include <minix/ds.h>
 #include <minix/sysutil.h>
 
 /*===========================================================================*
@@ -16,16 +17,18 @@ endpoint_t proc_nr;
 {
        int r;
        message m;
+       u32_t u32;
 
        if (pci_procnr == ANY)
        {
-               r= _pm_findproc("pci", &pci_procnr);
+               r= ds_retrieve_u32("pci", &u32);
                if (r != 0)
                {
-                       panic("pci",
+                       panic("syslib/" __FILE__,
                                "pci_del_acl: _pm_findproc failed for 'pci'",
                                r);
                }
+               pci_procnr = u32;
        }
 
 
@@ -34,7 +37,7 @@ endpoint_t proc_nr;
 
        r= sendrec(pci_procnr, &m);
        if (r != 0)
-               panic("pci", "pci_del_acl: can't talk to PCI", r);
+               panic("syslib/" __FILE__, "pci_del_acl: can't talk to PCI", r);
 
        return m.m_type;
 }

diff --git a/lib/syslib/pci_dev_name.c b/lib/syslib/pci_dev_name.c
index 0bc6f552c35d259f70d6728220b3041753035497..cd21f87d9c23884df3726697771f15fc85122419 100644 (file)
--- a/lib/syslib/pci_dev_name.c
+++ b/lib/syslib/pci_dev_name.c
@@ -37,7 +37,7 @@ u16_t did;
        r= sendrec(pci_procnr, &m);
        cpf_revoke(gid);
        if (r != 0)
-               panic("pci", "pci_dev_name: can't talk to PCI", r);
+               panic("syslib/" __FILE__, "pci_dev_name: can't talk to PCI", r);
 
        if (m.m_type == ENOENT)
        {
@@ -45,7 +45,7 @@ u16_t did;
                return NULL;    /* No name for this device */
        }
        if (m.m_type != 0)
-               panic("pci", "pci_dev_name: got bad reply from PCI", m.m_type);
+               panic("syslib/" __FILE__, "pci_dev_name: got bad reply from PCI", m.m_type);
 
        name[sizeof(name)-1]= '\0';     /* Make sure that the string is NUL
                                         * terminated.

diff --git a/lib/syslib/pci_find_dev.c b/lib/syslib/pci_find_dev.c
index c498ddec632d84610b666fb97613f47a24553b0c..db60548cb468fecefcf8786334eeeb5911b4d662 100644 (file)
--- a/lib/syslib/pci_find_dev.c
+++ b/lib/syslib/pci_find_dev.c
@@ -25,7 +25,7 @@ int *devindp;
 
        r= sendrec(pci_procnr, &m);
        if (r != 0)
-               panic("pci", "pci_find_dev: can't talk to PCI", r);
+               panic("syslib/" __FILE__, "pci_find_dev: can't talk to PCI", r);
 
        if (m.m_type == 1)
        {
@@ -35,7 +35,7 @@ int *devindp;
                return 1;
        }
        if (m.m_type != 0)
-               panic("pci", "pci_find_dev: got bad reply from PCI", m.m_type);
+               panic("syslib/" __FILE__, "pci_find_dev: got bad reply from PCI", m.m_type);
 
        printf("pci_find_dev: got nothing\n");
        return 0;

diff --git a/lib/syslib/pci_first_dev.c b/lib/syslib/pci_first_dev.c
index 9fd06de758685d57c628136328e6cccbf748dfe6..55d51f6b08a07b02a6bd8ffcaed1f428aebe27f7 100644 (file)
--- a/lib/syslib/pci_first_dev.c
+++ b/lib/syslib/pci_first_dev.c
@@ -20,7 +20,7 @@ u16_t *didp;
        m.m_type= BUSC_PCI_FIRST_DEV;
        r= sendrec(pci_procnr, &m);
        if (r != 0)
-               panic("pci", "pci_first_dev: can't talk to PCI", r);
+               panic("syslib/" __FILE__, "pci_first_dev: can't talk to PCI", r);
        if (m.m_type == 1)
        {
                *devindp= m.m1_i1;
@@ -33,7 +33,7 @@ u16_t *didp;
                return 1;
        }
        if (m.m_type != 0)
-               panic("pci", "pci_first_dev: got bad reply from PCI", m.m_type);
+               panic("syslib/" __FILE__, "pci_first_dev: got bad reply from PCI", m.m_type);
 
 #if DEBUG
        printf("pci_first_dev: got nothing\n");

diff --git a/lib/syslib/pci_ids.c b/lib/syslib/pci_ids.c
index 33f839fd2dc13d567d8f9082cb8ea6ac82eff5ef..38c30a485a18cd81e939febfccf585d5040448f2 100644 (file)
--- a/lib/syslib/pci_ids.c
+++ b/lib/syslib/pci_ids.c
@@ -22,10 +22,10 @@ u16_t *didp;
 
        r= sendrec(pci_procnr, &m);
        if (r != 0)
-               panic("pci", "pci_ids: can't talk to PCI", r);
+               panic("syslib/" __FILE__, "pci_ids: can't talk to PCI", r);
 
        if (m.m_type != 0)
-               panic("pci", "pci_ids: got bad reply from PCI", m.m_type);
+               panic("syslib/" __FILE__, "pci_ids: got bad reply from PCI", m.m_type);
        *vidp= m.m1_i1;
        *didp= m.m1_i2;
        printf("pci_ids: %04x/%04x\n", *vidp, *didp);

diff --git a/lib/syslib/pci_init1.c b/lib/syslib/pci_init1.c
index 0e6d6b32f60ec8fb1d34ac6244b3de815c787612..89d241acd22c50ab17a1b037a7294ca8819ac0f3 100644 (file)
--- a/lib/syslib/pci_init1.c
+++ b/lib/syslib/pci_init1.c
@@ -23,7 +23,7 @@ char *name;
 
        r= ds_retrieve_u32("pci", &u32);
        if (r != 0)
-               panic("pci", "pci_init1: ds_retrieve_u32 failed for 'pci'", r);
+               panic("syslib/" __FILE__, "pci_init1: ds_retrieve_u32 failed for 'pci'", r);
        pci_procnr= u32;
 
        m.m_type= BUSC_PCI_INIT;
@@ -38,8 +38,8 @@ char *name;
        }
        r= sendrec(pci_procnr, &m);
        if (r != 0)
-               panic("pci", "pci_init1: can't talk to PCI", r);
+               panic("syslib/" __FILE__, "pci_init1: can't talk to PCI", r);
        if (m.m_type != 0)
-               panic("pci", "pci_init1: got bad reply from PCI", m.m_type);
+               panic("syslib/" __FILE__, "pci_init1: got bad reply from PCI", m.m_type);
 }
 

diff --git a/lib/syslib/pci_next_dev.c b/lib/syslib/pci_next_dev.c
index 399c72d4e85564a00a56aae032a75fd066a9eed1..5471868815591d695fd94b30a0b5f3bbca849836 100644 (file)
--- a/lib/syslib/pci_next_dev.c
+++ b/lib/syslib/pci_next_dev.c
@@ -22,7 +22,7 @@ u16_t *didp;
 
        r= sendrec(pci_procnr, &m);
        if (r != 0)
-               panic("pci", "pci_next_dev: can't talk to PCI", r);
+               panic("syslib/" __FILE__, "pci_next_dev: can't talk to PCI", r);
 
        if (m.m_type == 1)
        {
@@ -36,7 +36,7 @@ u16_t *didp;
                return 1;
        }
        if (m.m_type != 0)
-               panic("pci", "pci_next_dev: got bad reply from PCI", m.m_type);
+               panic("syslib/" __FILE__, "pci_next_dev: got bad reply from PCI", m.m_type);
 
        return 0;
 }

diff --git a/lib/syslib/pci_rescan_bus.c b/lib/syslib/pci_rescan_bus.c
index 7542b202d5a13ed50b35932d562f008c90528e6e..ef0aed1ef902ba30811dd8e1b73560ee52a5aa55 100644 (file)
--- a/lib/syslib/pci_rescan_bus.c
+++ b/lib/syslib/pci_rescan_bus.c
@@ -20,11 +20,11 @@ u8_t busnr;
 
        r= sendrec(pci_procnr, &m);
        if (r != 0)
-               panic("pci", "pci_rescan_bus: can't talk to PCI", r);
+               panic("syslib/" __FILE__, "pci_rescan_bus: can't talk to PCI", r);
 
        if (m.m_type != 0)
        {
-               panic("pci", "pci_rescan_bus: got bad reply from PCI",
+               panic("syslib/" __FILE__, "pci_rescan_bus: got bad reply from PCI",
                        m.m_type);
        }
 }

diff --git a/lib/syslib/pci_reserve.c b/lib/syslib/pci_reserve.c
index 3c0941ad0fbbf0ce1d3b9099c69ef84851a71f6e..b00d6d8269378e99892cc0f88f11cb1dbd0618b8 100644 (file)
--- a/lib/syslib/pci_reserve.c
+++ b/lib/syslib/pci_reserve.c
@@ -20,10 +20,10 @@ int devind;
 
        r= sendrec(pci_procnr, &m);
        if (r != 0)
-               panic("pci", "pci_reserve: can't talk to PCI", r);
+               panic("syslib/" __FILE__, "pci_reserve: can't talk to PCI", r);
 
        if (m.m_type != 0)
-               panic("pci", "pci_reserve: got bad reply from PCI", m.m_type);
+               panic("syslib/" __FILE__, "pci_reserve: got bad reply from PCI", m.m_type);
 }
 
 /*===========================================================================*

diff --git a/lib/syslib/pci_set_acl.c b/lib/syslib/pci_set_acl.c
index d5ee446a5d76662730a26f341504be906402e29f..8e88853223118f8333d9da771e97af17cd4aa678 100644 (file)
--- a/lib/syslib/pci_set_acl.c
+++ b/lib/syslib/pci_set_acl.c
@@ -6,6 +6,7 @@ pci_set_acl.c
 #include "syslib.h"
 #include <unistd.h>
 #include <minix/rs.h>
+#include <minix/ds.h>
 #include <minix/sysutil.h>
 
 /*===========================================================================*
@@ -17,16 +18,18 @@ struct rs_pci *rs_pci;
        int r;
        cp_grant_id_t gid;
        message m;
+       u32_t u32;
 
        if (pci_procnr == ANY)
        {
-               r= _pm_findproc("pci", &pci_procnr);
+               r= ds_retrieve_u32("pci", &u32);
                if (r != 0)
                {
-                       panic("pci",
-                               "pci_set_acl: _pm_findproc failed for 'pci'",
+                       panic("syslib/" __FILE__,
+                               "pci_set_acl: ds_retrieve_u32 failed for 'pci'",
                                r);
                }
+               pci_procnr = u32;
        }
 
 
@@ -45,7 +48,7 @@ struct rs_pci *rs_pci;
        r= sendrec(pci_procnr, &m);
        cpf_revoke(gid);
        if (r != 0)
-               panic("pci", "pci_set_acl: can't talk to PCI", r);
+               panic("syslib/" __FILE__, "pci_set_acl: can't talk to PCI", r);
 
        return m.m_type;
 }

diff --git a/lib/syslib/pci_slot_name.c b/lib/syslib/pci_slot_name.c
index 98c049b4c04e91c0af578f481f2eff3b2d58648a..ad2d84092297dea771654e32e5e4ce71ec7313f3 100644 (file)
--- a/lib/syslib/pci_slot_name.c
+++ b/lib/syslib/pci_slot_name.c
@@ -35,10 +35,10 @@ int devind;
        r= sendrec(pci_procnr, &m);
        cpf_revoke(gid);
        if (r != 0)
-               panic("pci", "pci_slot_name: can't talk to PCI", r);
+               panic("syslib/" __FILE__, "pci_slot_name: can't talk to PCI", r);
 
        if (m.m_type != 0)
-               panic("pci", "pci_slot_name: got bad reply from PCI", m.m_type);
+               panic("syslib/" __FILE__, "pci_slot_name: got bad reply from PCI", m.m_type);
 
        name[sizeof(name)-1]= '\0';     /* Make sure that the string is NUL
                                         * terminated.