Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pci: remove pci_init1 API call

Browse Source
This commit is contained in:
David van Moolenbroek
2012-03-07 01:10:04 +01:00
parent c8b892d835
commit 21ed531c8f
6 changed files with 20 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libsys/Makefile
View File

@@ -38,7 +38,6 @@ SRCS= \
pci_get_bar.c \
pci_ids.c \
pci_init.c \
pci_init1.c \
pci_next_dev.c \
pci_rescan_bus.c \
pci_reserve.c \

20
lib/libsys/pci_init.c
View File

@@ -3,12 +3,28 @@ pci_init.c
*/
#include "syslib.h"
#include <minix/ds.h>
#include <minix/sysutil.h>
endpoint_t pci_procnr= ANY;
/*===========================================================================*
* pci_init *
*===========================================================================*/
PUBLIC void pci_init()
PUBLIC void pci_init(void)
{
pci_init1("");
int r;
message m;
r= ds_retrieve_label_endpt("pci", &pci_procnr);
if (r != 0)
panic("pci_init: unable to obtain label for 'pci': %d", r);
m.m_type= BUSC_PCI_INIT;
r= sendrec(pci_procnr, &m);
if (r != 0)
panic("pci_init: can't talk to PCI: %d", r);
if (m.m_type != 0)
panic("pci_init: got bad reply from PCI: %d", m.m_type);
}

46
lib/libsys/pci_init1.c
View File

@@ -1,46 +0,0 @@
/*
pci_init1.c
*/
#include "pci.h"
#include "syslib.h"
#include <string.h>
#include <unistd.h>
#include <minix/ds.h>
#include <minix/sysutil.h>
int pci_procnr= ANY;
/*===========================================================================*
* pci_init1 *
*===========================================================================*/
PUBLIC void pci_init1(name)
char *name;
{
int r;
endpoint_t endpoint;
size_t len;
message m;
r= ds_retrieve_label_endpt("pci", &endpoint);
if (r != 0)
panic("pci_init1: ds_retrieve_label_endpt failed for 'pci': %d", r);
pci_procnr= endpoint;
m.m_type= BUSC_PCI_INIT;
len= strlen(name);
if (len+1 <= sizeof(m.m3_ca1))
strcpy(m.m3_ca1, name);
else
{
len= sizeof(m.m3_ca1)-1;
memcpy(m.m3_ca1, name, len);
m.m3_ca1[len]= '\0';
}
r= sendrec(pci_procnr, &m);
if (r != 0)
panic("pci_init1: can't talk to PCI: %d", r);
if (m.m_type != 0)
panic("pci_init1: got bad reply from PCI: %d", m.m_type);
}