On Mon, Jun 25, 2007 at 02:59:51PM -0700, ron minnich wrote:
try this one.
Better, thanks, but some more comments:
arch library file inluded in include/lib.h Signed-off-by: Ronald G. Minnich rminnich@gmail.com
Index: include/lib.h
--- include/lib.h (revision 364) +++ include/lib.h (working copy) @@ -37,4 +37,5 @@ void ram_failure(const char *why); void ram_initialize(int controllers, void *ctrl);
+#include <arch/lib.h> #endif /* LIB_H */
I think we handle this differently currently (and that works fine so far) -- we should not include include/arch/x86/arch/lib.h in include/lib.h, but rather change the Makefile to add the include/arch/x86 path to the includes.
The only drawback is that we cannot have files with the same name in include/arch/FOO/arch/ and include/ (but that's already the case for the current files).
Index: include/arch/x86/arch/lib.h
--- include/arch/x86/arch/lib.h (revision 0) +++ include/arch/x86/arch/lib.h (revision 0) @@ -0,0 +1,26 @@ +/*
- This file is part of the LinuxBIOS project.
- Copyright (C) 2007 Ron Minnich
- 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; version 2 of the License.
- 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_X86_LIB_H +#define ARCH_X86_LIB_H
Should be ARCH_X86_ARCH_LIB_H now (yes, looks stupid, but so does the directory hierarchy :)
+void uart_init(void); +void rtc_init(int invalid); +void isa_dma_init(void);
+#endif /* ARCH_X86_LIB_H */
Ditto here.
Uwe.