erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- drop unused duplicate include/cpu/generic/x86/pci_ops.h

Browse source 
- fix ifdef in x86/arch/pci_ops.h
- fix function prototypes to match declarations in include/device/pci.h

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>



git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@189 f3766cd6-281f-0410-b1cd-43a5c92072e9
This commit is contained in:
Stefan Reinauer 2007-03-05 17:53:45 +00:00
commit 4dac3a3dc2
3 changed files with 21 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

31
include/cpu/generic/x86/arch/pci_ops.h
View file

@ -1,26 +1,25 @@
/*
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef ARCH_I386_PCI_OPS_H
#define ARCH_I386_PCI_OPS_H
extern struct pci_bus_operations pci_cf8_conf1;
extern struct pci_bus_operations pci_cf8_conf2;
#if defined(CONFIG_MMCONF_SUPPORT) && (CONFIG_MMCONF_SUPPORT=='y')
#if defined(CONFIG_MMCONF_SUPPORT) && (CONFIG_MMCONF_SUPPORT==1)
extern struct pci_bus_operations pci_ops_mmconf;
#endif

25
include/cpu/generic/x86/pci_ops.h
View file

@ -1,25 +0,0 @@
/*
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef ARCH_I386_PCI_OPS_H
#define ARCH_I386_PCI_OPS_H
const struct pci_bus_operations pci_cf8_conf1;
const struct pci_bus_operations pci_cf8_conf2;
void pci_set_method(device_t dev);
#endif /* ARCH_I386_PCI_OPS_H */

17
include/device/pci.h
View file

@ -48,17 +48,12 @@ struct pci_operations {
/* Common pci bus operations */
struct pci_bus_operations {
u8 (*read8)(struct bus *pbus, unsigned char bus, int devfn, int where);
u16 (*read16)(struct bus *pbus, unsigned char bus, int devfn,
int where);
u32 (*read32)(struct bus *pbus, unsigned char bus, int devfn,
int where);
void (*write8)(struct bus *pbus, unsigned char bus, int devfn,
int where, u8 val);
void (*write16)(struct bus *pbus, unsigned char bus, int devfn,
int where, u16 val);
void (*write32)(struct bus *pbus, unsigned char bus, int devfn,
int where, u32 val);
u8 (*read8)(struct bus *pbus, int bus, int devfn, int where);
u16 (*read16)(struct bus *pbus, int bus, int devfn, int where);
u32 (*read32)(struct bus *pbus, int bus, int devfn, int where);
void (*write8)(struct bus *pbus, int bus, int devfn, int where, u8 val);
void (*write16)(struct bus *pbus, int bus, int devfn, int where, u16 val);
void (*write32)(struct bus *pbus, int bus, int devfn, int where, u32 val);
};
struct pci_driver {