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

* rename devices to device for consistency

Browse source 
* fix malloc.c warnings
* add PCI_BUS_SEGN_BITS to 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@92 f3766cd6-281f-0410-b1cd-43a5c92072e9
This commit is contained in:
Stefan Reinauer 2007-02-23 11:23:37 +00:00
commit 791e590dea
16 changed files with 29 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
arch/x86/Makefile
View file

@ -54,9 +54,9 @@ $(obj)/linuxbios.stage2: $(obj)/stage0.init $(obj)/statictree.o
#
# main
$(Q)$(CC) $(INITCFLAGS) -c $(src)/lib/stage2.c -o $(obj)/stage2.o
$(Q)$(CC) $(INITCFLAGS) -c $(src)/devices/device.c -o $(obj)/device.o
$(Q)$(CC) $(INITCFLAGS) -c $(src)/devices/device_util.c -o $(obj)/device_util.o
$(Q)$(CC) $(INITCFLAGS) -c $(src)/devices/root_device.c -o $(obj)/root_device.o
$(Q)$(CC) $(INITCFLAGS) -c $(src)/device/device.c -o $(obj)/device.o
$(Q)$(CC) $(INITCFLAGS) -c $(src)/device/device_util.c -o $(obj)/device_util.o
$(Q)$(CC) $(INITCFLAGS) -c $(src)/device/root_device.c -o $(obj)/root_device.o
$(Q)$(CC) $(INITCFLAGS) -c $(src)/lib/mem.c -o $(obj)/mem.o
$(Q)$(CC) $(INITCFLAGS) -c $(src)/lib/malloc.c -o $(obj)/malloc.o
$(Q)$(CC) $(INITCFLAGS) -c $(src)/lib/clog2.c -o $(obj)/clog2.o

0
devices/agp_device.c → device/agp_device.c
View file

0
devices/cardbus_device.c → device/cardbus_device.c
View file

0
devices/device.c → device/device.c
View file

0
devices/device_util.c → device/device_util.c
View file

0
devices/hypertransport.c → device/hypertransport.c
View file

0
devices/pci_device.c → device/pci_device.c
View file

0
devices/pci_ops.c → device/pci_ops.c
View file

0
devices/pci_rom.c → device/pci_rom.c
View file

0
devices/pciexp_device.c → device/pciexp_device.c
View file

0
devices/pcix_device.c → device/pcix_device.c
View file

0
devices/pnp_device.c → device/pnp_device.c
View file

0
devices/root_device.c → device/root_device.c
View file

0
devices/smbus_ops.c → device/smbus_ops.c
View file

42
include/device/pci.h
View file

@ -1,24 +1,26 @@
/*
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
*/
/*
* PCI defines and function prototypes
* Copyright 1994, Drew Eckhardt
* Copyright 1997--1999 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
* This file is part of the LinuxBIOS project.
*
* PCI defines and function prototypes
* Copyright 1994, Drew Eckhardt
* Copyright 1997-1999 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
*
* 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
*/
/*
* For more information, please consult the following manuals (look at
* http://www.pcisig.com/ for how to get them):
*
@ -98,6 +100,8 @@ void pci_dev_set_subsystem(struct device * dev, unsigned vendor, unsigned device
#define PCI_IO_BRIDGE_ALIGN 4096
#define PCI_MEM_BRIDGE_ALIGN (1024*1024)
#define PCI_BUS_SEGN_BITS 0
static inline const struct pci_operations *ops_pci(struct device * dev)
{
const struct pci_operations *pops;

8
lib/malloc.c
View file

@ -23,9 +23,9 @@
#include <console/console.h>
#if 0
#define MALLOCDBG(x)
#define MALLOCDBG(x...)
#else
#define MALLOCDBG(x) printk x
#define MALLOCDBG(x...) printk (BIOS_SPEW, x)
#endif
/* instead of ldscript magic, just declare an array. The array
@ -56,7 +56,7 @@ void *malloc(size_t size)
{
void *p;
MALLOCDBG(("%s Enter, size %d, free_mem_ptr %p\n", __FUNCTION__, size, free_mem_ptr));
MALLOCDBG("%s Enter, size %d, free_mem_ptr %p\n", __FUNCTION__, size, free_mem_ptr);
if (size < 0)
die("Error! malloc: Size < 0");
if (free_mem_ptr <= 0)
@ -70,7 +70,7 @@ void *malloc(size_t size)
if (free_mem_ptr >= free_mem_end_ptr)
die("Error! malloc: free_mem_ptr >= free_mem_end_ptr");
MALLOCDBG(("malloc 0x%08lx\n", (unsigned long)p));
MALLOCDBG("malloc 0x%08lx\n", (unsigned long)p);
return p;
}