pci: remove pci_init1 API call
This commit is contained in:
parent
c8b892d835
commit
21ed531c8f
6 changed files with 20 additions and 56 deletions
|
@ -48,7 +48,6 @@ PRIVATE struct pcitab pcitab_ti[]=
|
||||||
|
|
||||||
{ 0x0000, 0x0000, 0 }
|
{ 0x0000, 0x0000, 0 }
|
||||||
};
|
};
|
||||||
PRIVATE char *progname;
|
|
||||||
PRIVATE int debug;
|
PRIVATE int debug;
|
||||||
|
|
||||||
FORWARD _PROTOTYPE( void hw_init, (struct port *pp) );
|
FORWARD _PROTOTYPE( void hw_init, (struct port *pp) );
|
||||||
|
@ -110,9 +109,6 @@ PRIVATE int sef_cb_init_fresh(int UNUSED(type), sef_init_info_t *UNUSED(info))
|
||||||
int c, i, r, first, devind, port;
|
int c, i, r, first, devind, port;
|
||||||
u16_t vid, did;
|
u16_t vid, did;
|
||||||
|
|
||||||
(progname=strrchr(env_argv[0],'/')) ? progname++
|
|
||||||
: (progname=env_argv[0]);
|
|
||||||
|
|
||||||
if((r=tsc_calibrate()) != OK)
|
if((r=tsc_calibrate()) != OK)
|
||||||
panic("tsc_calibrate failed: %d", r);
|
panic("tsc_calibrate failed: %d", r);
|
||||||
|
|
||||||
|
@ -127,7 +123,7 @@ PRIVATE int sef_cb_init_fresh(int UNUSED(type), sef_init_info_t *UNUSED(info))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pci_init1(progname);
|
pci_init();
|
||||||
|
|
||||||
first= 1;
|
first= 1;
|
||||||
port= 0;
|
port= 0;
|
||||||
|
|
|
@ -237,7 +237,6 @@ _PROTOTYPE(int sys_in, (int port, u32_t *value, int type) );
|
||||||
|
|
||||||
/* pci.c */
|
/* pci.c */
|
||||||
_PROTOTYPE( void pci_init, (void) );
|
_PROTOTYPE( void pci_init, (void) );
|
||||||
_PROTOTYPE( void pci_init1, (char *name) );
|
|
||||||
_PROTOTYPE( int pci_first_dev, (int *devindp, u16_t *vidp, u16_t *didp) );
|
_PROTOTYPE( int pci_first_dev, (int *devindp, u16_t *vidp, u16_t *didp) );
|
||||||
_PROTOTYPE( int pci_next_dev, (int *devindp, u16_t *vidp, u16_t *didp) );
|
_PROTOTYPE( int pci_next_dev, (int *devindp, u16_t *vidp, u16_t *didp) );
|
||||||
_PROTOTYPE( int pci_find_dev, (u8_t bus, u8_t dev, u8_t func,
|
_PROTOTYPE( int pci_find_dev, (u8_t bus, u8_t dev, u8_t func,
|
||||||
|
|
|
@ -55,7 +55,7 @@ PUBLIC void ddekit_pci_init_only_one(int skip)
|
||||||
|
|
||||||
DDEBUG_MSG_INFO("Initializing PCI subsystem...");
|
DDEBUG_MSG_INFO("Initializing PCI subsystem...");
|
||||||
|
|
||||||
pci_init1("symbol clash");
|
pci_init();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Iterate the PCI-bus
|
* Iterate the PCI-bus
|
||||||
|
|
|
@ -38,7 +38,6 @@ SRCS= \
|
||||||
pci_get_bar.c \
|
pci_get_bar.c \
|
||||||
pci_ids.c \
|
pci_ids.c \
|
||||||
pci_init.c \
|
pci_init.c \
|
||||||
pci_init1.c \
|
|
||||||
pci_next_dev.c \
|
pci_next_dev.c \
|
||||||
pci_rescan_bus.c \
|
pci_rescan_bus.c \
|
||||||
pci_reserve.c \
|
pci_reserve.c \
|
||||||
|
|
|
@ -3,12 +3,28 @@ pci_init.c
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "syslib.h"
|
#include "syslib.h"
|
||||||
|
#include <minix/ds.h>
|
||||||
|
#include <minix/sysutil.h>
|
||||||
|
|
||||||
|
endpoint_t pci_procnr= ANY;
|
||||||
|
|
||||||
/*===========================================================================*
|
/*===========================================================================*
|
||||||
* pci_init *
|
* 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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);
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in a new issue