Author: blueswirl
Date: 2008-11-17 20:42:11 +0100 (Mon, 17 Nov 2008)
New Revision: 250
Modified:
openbios-devel/arch/sparc32/builtin.c
openbios-devel/arch/sparc32/romvec.c
openbios-devel/arch/sparc64/builtin.c
openbios-devel/drivers/adb.c
openbios-devel/drivers/adb.h
openbios-devel/drivers/esp.h
openbios-devel/drivers/kbd.c
openbios-devel/drivers/kbd.h
openbios-devel/drivers/vga_load_regs.c
openbios-devel/fs/grubfs/fsys_ext2fs.c
openbios-devel/fs/grubfs/fsys_reiserfs.c
openbios-devel/fs/grubfs/fsys_ufs.c
openbios-devel/include/ppc/types.h
openbios-devel/include/sparc32/types.h
openbios-devel/include/sparc64/types.h
Log:
Fix system include file use
Modified: openbios-devel/arch/sparc32/builtin.c
===================================================================
--- openbios-devel/arch/sparc32/builtin.c 2008-11-16 19:40:16 UTC (rev 249)
+++ openbios-devel/arch/sparc32/builtin.c 2008-11-17 19:42:11 UTC (rev 250)
@@ -7,7 +7,7 @@
*/
#include "openbios/config.h"
-#include <asm/types.h>
+#include "asm/types.h"
#include "sys_info.h"
/*
Modified: openbios-devel/arch/sparc32/romvec.c
===================================================================
--- openbios-devel/arch/sparc32/romvec.c 2008-11-16 19:40:16 UTC (rev 249)
+++ openbios-devel/arch/sparc32/romvec.c 2008-11-17 19:42:11 UTC (rev 250)
@@ -8,7 +8,6 @@
*/
#include "openprom.h"
-#include "stdint.h"
#include "asm/io.h"
#include "asm/types.h"
#include "libc/vsprintf.h"
Modified: openbios-devel/arch/sparc64/builtin.c
===================================================================
--- openbios-devel/arch/sparc64/builtin.c 2008-11-16 19:40:16 UTC (rev 249)
+++ openbios-devel/arch/sparc64/builtin.c 2008-11-17 19:42:11 UTC (rev 250)
@@ -7,7 +7,7 @@
*/
#include "openbios/config.h"
-#include <asm/types.h>
+#include "asm/types.h"
#include "sys_info.h"
/*
Modified: openbios-devel/drivers/adb.c
===================================================================
--- openbios-devel/drivers/adb.c 2008-11-16 19:40:16 UTC (rev 249)
+++ openbios-devel/drivers/adb.c 2008-11-17 19:42:11 UTC (rev 250)
@@ -23,6 +23,7 @@
#include "openbios/config.h"
#include "openbios/bindings.h"
+#include "asm/types.h"
#include "adb.h"
#include "kbd.h"
#include "cuda.h"
Modified: openbios-devel/drivers/adb.h
===================================================================
--- openbios-devel/drivers/adb.h 2008-11-16 19:40:16 UTC (rev 249)
+++ openbios-devel/drivers/adb.h 2008-11-17 19:42:11 UTC (rev 250)
@@ -20,8 +20,6 @@
#if !defined(__OHW_ADB_H__)
#define __OHW_ADB_H__
-#include <stdint.h>
-
typedef struct adb_bus_t adb_bus_t;
typedef struct adb_dev_t adb_dev_t;
Modified: openbios-devel/drivers/esp.h
===================================================================
--- openbios-devel/drivers/esp.h 2008-11-16 19:40:16 UTC (rev 249)
+++ openbios-devel/drivers/esp.h 2008-11-17 19:42:11 UTC (rev 250)
@@ -9,7 +9,7 @@
#define _SPARC_ESP_H
/* For dvma controller register definitions. */
-#include <asm/dma.h>
+#include "asm/dma.h"
/* The ESP SCSI controllers have their register sets in three
* "classes":
Modified: openbios-devel/drivers/kbd.c
===================================================================
--- openbios-devel/drivers/kbd.c 2008-11-16 19:40:16 UTC (rev 249)
+++ openbios-devel/drivers/kbd.c 2008-11-17 19:42:11 UTC (rev 250)
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
*/
-#include <stdlib.h>
-#include <stdio.h>
+#include "asm/types.h"
#include "kbd.h"
//#define DEBUG_KBD
Modified: openbios-devel/drivers/kbd.h
===================================================================
--- openbios-devel/drivers/kbd.h 2008-11-16 19:40:16 UTC (rev 249)
+++ openbios-devel/drivers/kbd.h 2008-11-17 19:42:11 UTC (rev 250)
@@ -21,7 +21,6 @@
#if !defined (__OHW_KBD_H__)
#define __OHW_KBD_H__
-#include <stdint.h>
typedef struct kbd_t kbd_t;
typedef struct keymap_t keymap_t;
struct kbd_t {
Modified: openbios-devel/drivers/vga_load_regs.c
===================================================================
--- openbios-devel/drivers/vga_load_regs.c 2008-11-16 19:40:16 UTC (rev 249)
+++ openbios-devel/drivers/vga_load_regs.c 2008-11-17 19:42:11 UTC (rev 250)
@@ -1,6 +1,5 @@
#include "asm/io.h"
#include "video_subr.h"
-#include "string.h"
#include "vga.h"
/*
Modified: openbios-devel/fs/grubfs/fsys_ext2fs.c
===================================================================
--- openbios-devel/fs/grubfs/fsys_ext2fs.c 2008-11-16 19:40:16 UTC (rev 249)
+++ openbios-devel/fs/grubfs/fsys_ext2fs.c 2008-11-17 19:42:11 UTC (rev 250)
@@ -22,7 +22,7 @@
#include "openbios/config.h"
#include "shared.h"
#include "filesys.h"
-#include <libc/byteorder.h>
+#include "libc/byteorder.h"
#ifdef CONFIG_DEBUG_EXT2FS
#define E2DEBUG
Modified: openbios-devel/fs/grubfs/fsys_reiserfs.c
===================================================================
--- openbios-devel/fs/grubfs/fsys_reiserfs.c 2008-11-16 19:40:16 UTC (rev 249)
+++ openbios-devel/fs/grubfs/fsys_reiserfs.c 2008-11-17 19:42:11 UTC (rev 250)
@@ -40,7 +40,7 @@
/* linux/posix_type.h */
typedef long linux_off_t;
-#include <libc/byteorder.h>
+#include "libc/byteorder.h"
/* include/linux/reiser_fs.h */
/* This is the new super block of a journaling reiserfs system */
Modified: openbios-devel/fs/grubfs/fsys_ufs.c
===================================================================
--- openbios-devel/fs/grubfs/fsys_ufs.c 2008-11-16 19:40:16 UTC (rev 249)
+++ openbios-devel/fs/grubfs/fsys_ufs.c 2008-11-17 19:42:11 UTC (rev 250)
@@ -53,7 +53,7 @@
*/
#ifdef FSYS_UFS
-#include <stdint.h>
+#include "asm/types.h"
#include "shared.h"
#include "filesys.h"
Modified: openbios-devel/include/ppc/types.h
===================================================================
--- openbios-devel/include/ppc/types.h 2008-11-16 19:40:16 UTC (rev 249)
+++ openbios-devel/include/ppc/types.h 2008-11-17 19:42:11 UTC (rev 250)
@@ -11,30 +11,22 @@
#include "mconfig.h"
-#ifndef __APPLE__
+#ifdef BOOTSTRAP
#include <stdint.h>
#else
-/* Mac OS X */
-typedef char int8_t;
-typedef unsigned char uint8_t;
-typedef unsigned char u_int8_t;
-typedef short int16_t;
-typedef unsigned short uint16_t;
-typedef unsigned short u_int16_t;
-typedef int int32_t;
-typedef unsigned int uint32_t;
-typedef unsigned int u_int32_t;
-typedef long long int64_t;
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
typedef unsigned long long uint64_t;
-typedef unsigned long long u_int64_t;
+
+typedef signed char int8_t;
+typedef short int16_t;
+typedef int int32_t;
+typedef long long int64_t;
#endif
/* endianess */
-#ifdef HAVE_ENDIAN_H
-#include <endian.h>
-#else
-#include <machine/endian.h>
-#endif
+#include "autoconf.h"
/* cell based types */
Modified: openbios-devel/include/sparc32/types.h
===================================================================
--- openbios-devel/include/sparc32/types.h 2008-11-16 19:40:16 UTC (rev 249)
+++ openbios-devel/include/sparc32/types.h 2008-11-17 19:42:11 UTC (rev 250)
@@ -11,8 +11,20 @@
#include "mconfig.h"
+#ifdef BOOTSTRAP
#include <stdint.h>
+#else
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+typedef unsigned long long uint64_t;
+typedef signed char int8_t;
+typedef short int16_t;
+typedef int int32_t;
+typedef long long int64_t;
+#endif
+
/* endianess */
#include "autoconf.h"
Modified: openbios-devel/include/sparc64/types.h
===================================================================
--- openbios-devel/include/sparc64/types.h 2008-11-16 19:40:16 UTC (rev 249)
+++ openbios-devel/include/sparc64/types.h 2008-11-17 19:42:11 UTC (rev 250)
@@ -11,23 +11,39 @@
#include "mconfig.h"
+#ifdef BOOTSTRAP
#include <stdint.h>
+#else
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+typedef unsigned long long uint64_t;
+typedef signed char int8_t;
+typedef short int16_t;
+typedef int int32_t;
+typedef long long int64_t;
+#endif
+
+/* endianess */
+#include "autoconf.h"
+
+/* cell based types */
+typedef int64_t cell;
+typedef uint64_t ucell;
+
#ifdef NEED_FAKE_INT128_T
typedef struct {
uint64_t hi;
uint64_t lo;
} blob_128_t;
-typedef blob_128_t __int128_t;
-typedef blob_128_t __uint128_t;
-#endif
-
-/* cell based types */
-typedef int64_t cell;
-typedef uint64_t ucell;
+typedef blob_128_t dcell;
+typedef blob_128_t ducell;
+#else
typedef __int128_t dcell;
typedef __uint128_t ducell;
+#endif
#define bitspercell (sizeof(cell)<<3)
#define bitsperdcell (sizeof(dcell)<<3)
@@ -39,11 +55,11 @@
typedef unsigned char u8;
typedef unsigned short u16;
typedef unsigned int u32;
-typedef unsigned long u64;
+typedef unsigned long long u64;
typedef signed char s8;
typedef short s16;
typedef int s32;
-typedef long s64;
+typedef long long s64;
#endif