Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 460 → Rev 461

/shark/trunk/drivers/newpci/include/drivers/shark_pci26.h
0,0 → 1,28
/*
* Project: S.Ha.R.K.
*
* Coordinators:
* Giorgio Buttazzo <giorgio@sssup.it>
* Paolo Gai <pj@gandalf.sssup.it>
*
* Authors :
* Giacomo Guidi <giacomo@gandalf.sssup.it>
*
*
* ReTiS Lab (Scuola Superiore S.Anna - Pisa - Italy)
*
* http://www.sssup.it
* http://retis.sssup.it
* http://shark.sssup.it
*/
 
/* Glue Layer Header Linux PCI 2.6 Driver*/
 
#ifndef __SHARK_PCI26__
#define __SHARK_PCI26__
 
/* Init the PCI 2.6 Driver */
int PCI26_init(void);
 
#endif
 
/shark/trunk/drivers/newpci/search.c
48,7 → 48,6
struct pci_bus *tmp_bus;
 
while ((bus = pci_find_next_bus(bus)) != NULL) {
cprintf("Domain = %d\n",pci_domain_nr(bus));
if (pci_domain_nr(bus) != domain)
continue;
tmp_bus = pci_do_find_bus(bus, busnr);
/shark/trunk/drivers/newpci/probe.c
406,7 → 406,7
u32 class;
 
dev->slot_name = dev->dev.bus_id;
sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(dev->bus),
sprintf26(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(dev->bus),
dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
 
INIT_LIST_HEAD(&dev->pools);
662,7 → 662,7
 
memset(b->dev,0,sizeof(*(b->dev)));
b->dev->parent = parent;
sprintf(b->dev->bus_id,"pci%04x:%02x", pci_domain_nr(b), bus);
sprintf26(b->dev->bus_id,"pci%04x:%02x", pci_domain_nr(b), bus);
device_register(b->dev);
 
b->number = b->secondary = bus;
671,8 → 671,6
 
b->subordinate = pci_scan_child_bus(b);
 
cprintf("PCI: Pci Bus Add Devices\n");
 
pci_bus_add_devices(b);
 
return b;
/shark/trunk/drivers/newpci/shark_pci26.c
0,0 → 1,44
/*
* Project: S.Ha.R.K.
*
* Coordinators:
* Giorgio Buttazzo <giorgio@sssup.it>
* Paolo Gai <pj@gandalf.sssup.it>
*
* Authors :
* Giacomo Guidi <giacomo@gandalf.sssup.it>
*
*
* ReTiS Lab (Scuola Superiore S.Anna - Pisa - Italy)
*
* http://www.sssup.it
* http://retis.sssup.it
* http://shark.sssup.it
*/
 
/* Glue Layer for Linux PCI 2.6 Driver */
#include <kernel/kern.h>
 
extern int pci_direct_init(void);
extern int pcibios_init(void);
extern int pci_driver_init(void);
extern int pci_legacy_init(void);
extern int pci_init(void);
 
/* Init the Linux PCI 2.6 Driver */
int PCI26_init() {
 
pci_direct_init();
pcibios_init();
pci_driver_init();
 
pci_legacy_init();
pci_init();
 
return 0;
 
}
/shark/trunk/drivers/newpci/makefile
13,7 → 13,7
OBJS = access.o bus.o names.o pci.o pci-driver.o\
pool.o probe.o quirks.o remove.o search.o setup-res.o\
setup-irq.o setup-bus.o syscall.o i386.o common.o\
fixup.o irq.o legacy.o pcbios.o direct.o shark_pci.o
fixup.o irq.o legacy.o pcbios.o direct.o shark_pci26.o
 
OTHERINCL += -I$(BASE)/drivers/linuxc26/include