Date:	2010-09-10 17:14:50 (13 years 7 months ago)
Author:	Azimutz
Commit:	515
Parents:	514
Message:	Finish messing with #include preprocessor. No other intention here but "research", though i doubt i will get this back to how it was?! Time will tell.. it's not like the booter will work better (or worse) because of these changes. Just getting a better overall picture of what's needed and were!
Changes:	M /branches/azimutz/Chazi/i386/libsaio/pci_root.c M /branches/azimutz/Chazi/i386/libsaio/stringTable.c M /branches/azimutz/Chazi/i386/libsaio/biosfn.c M /branches/azimutz/Chazi/i386/boot2/modules.h M /branches/azimutz/Chazi/i386/libsaio/convert.h M /branches/azimutz/Chazi/i386/boot2/gui.c M /branches/azimutz/Chazi/i386/libsaio/fake_efi.c M /branches/azimutz/Chazi/i386/libsaio/usb.c M /branches/azimutz/Chazi/i386/libsaio/device_inject.c M /branches/azimutz/Chazi/i386/libsaio/autoresolution.c M /branches/azimutz/Chazi/i386/boot2/gui.h M /branches/azimutz/Chazi/i386/libsaio/gma_resolution.h M /branches/azimutz/Chazi/i386/boot2/ramdisk.c M /branches/azimutz/Chazi/i386/boot2/options.c M /branches/azimutz/Chazi/i386/libsaio/autoresolution.h M /branches/azimutz/Chazi/i386/boot2/ramdisk.h M /branches/azimutz/Chazi/i386/libsaio/console.c M /branches/azimutz/Chazi/i386/modules/KernelPatcher/kernel_patcher.c M /branches/azimutz/Chazi/i386/boot2/resume.c M /branches/azimutz/Chazi/i386/libsaio/ati_resolution.h M /branches/azimutz/Chazi/i386/boot2/boot.c M /branches/azimutz/Chazi/i386/modules/KernelPatcher/kernel_patcher.h M /branches/azimutz/Chazi/i386/libsaio/nvidia.c M /branches/azimutz/Chazi/i386/libsaio/ntfs.c M /branches/azimutz/Chazi/i386/boot2/boot.h M /branches/azimutz/Chazi/i386/modules/HelloWorld/HelloWorld.c M /branches/azimutz/Chazi/i386/libsaio/vbe.c M /branches/azimutz/Chazi/i386/libsaio/ufs_byteorder.c M /branches/azimutz/Chazi/i386/libsaio/ati.c M /branches/azimutz/Chazi/i386/libsaio/bootstruct.h M /branches/azimutz/Chazi/i386/libsaio/sys.c M /branches/azimutz/Chazi/i386/libsaio/device_tree.c M /branches/azimutz/Chazi/i386/libsaio/load.c M /branches/azimutz/Chazi/i386/libsaio/hfs.c M /branches/azimutz/Chazi/i386/boot2/drivers.c M /branches/azimutz/Chazi/i386/libsaio/vbe.h M /branches/azimutz/Chazi/i386/libsaio/acpi_patcher.c M /branches/azimutz/Chazi/i386/boot2/mboot.c M /branches/azimutz/Chazi/i386/libsaio/sl.h M /branches/azimutz/Chazi/i386/libsaio/allocate.c M /branches/azimutz/Chazi/i386/libsaio/platform.c M /branches/azimutz/Chazi/i386/libsaio/hfs_compare.c M /branches/azimutz/Chazi/i386/libsaio/spd.c M /branches/azimutz/Chazi/i386/libsaio/cpu.c M /branches/azimutz/Chazi/i386/libsaio/libsaio.h M /branches/azimutz/Chazi/i386/libsaio/disk.c M /branches/azimutz/Chazi/i386/libsaio/pci_setup.c M /branches/azimutz/Chazi/i386/libsaio/spd.h M /branches/azimutz/Chazi/i386/libsaio/ufs.c M /branches/azimutz/Chazi/i386/boot2/lzss.c M /branches/azimutz/Chazi/i386/libsaio/nvidia_resolution.h M /branches/azimutz/Chazi/i386/libsaio/smbios_patcher.c M /branches/azimutz/Chazi/i386/libsaio/cache.c M /branches/azimutz/Chazi/i386/boot2/graphics.c M /branches/azimutz/Chazi/i386/libsaio/edid.c M /branches/azimutz/Chazi/i386/libsaio/smbios_patcher.h M /branches/azimutz/Chazi/i386/boot2/graphics.h M /branches/azimutz/Chazi/i386/boot2/modules.c

File differences

branches/azimutz/Chazi/i386/libsaio/console.c
45 45 46 46 47 47 48 48 49 49 50 50 51 51	*/␊ ␊ //#include "libsaio.h"␊ #include "bootstruct.h" - most libsaio.h stuff is included here now.␊ #include "bootstruct.h"␊ ␊ extern int␉vprf(const char * fmt, va_list ap);␊ ␊

branches/azimutz/Chazi/i386/libsaio/ati_resolution.h
11 11 12 12 13 13 14 15 16 17 14 18 15 19 16	#define _ATI_RESOLUTION_H_␊ ␊ //#include "libsaio.h"␊ #include "libsa.h"␊ #include "saio_internal.h"␊ //---␊ #include "autoresolution.h"␊ ␊ #define ATI_SIGNATURE1 "ATI MOBILITY RADEON"␊

branches/azimutz/Chazi/i386/libsaio/vbe.c
30 30 31 31 32 32 33 34 33 35 34 36 35	#include "io_inline.h"␊ #include "saio_types.h"␊ #include "saio_internal.h"␊ //--- hum, check again; getting the feeling that the headers feed on the included here!?␊ #include "vbe.h"␊ ␊ /* ␊

branches/azimutz/Chazi/i386/libsaio/bootstruct.h
29 29 30 30 31 31 32 32 33 33 34 34 35 36 35 37 36 38 37 39 38	␊ //Azi: this is acting now as a mini libsaio.h :P␊ //#include "libsaio.h"␊ //#include "bios.h"␊ #include "libsa.h"␊ #include "saio_types.h"␊ #include "saio_internal.h" // "external" to verbose function␊ //---␊ #include "bios.h"␊ #include "saio_internal.h"␊ #include "device_tree.h"␊ ␊ /*!␊

branches/azimutz/Chazi/i386/libsaio/device_tree.c
37 37 38 38 39 39 40 41 40 42 41 43 42	//Azi: check location.␊ //#include "libsaio.h"␊ #include "libsa.h"␊ //---␊ #include "device_tree.h"␊ ␊ #if DEBUG␊

branches/azimutz/Chazi/i386/libsaio/hfs.c
27 27 28 28 29 29 30 30 31 31 32 32 33 33 34	* DRI: Josh de Cesare␊ */␊ ␊ #include <sl.h>␊ //#include <sl.h>␊ #include "sl.h" //Azi:???␊ #include <hfs/hfs_format.h>␊ ␊ #include "hfs.h"␊

branches/azimutz/Chazi/i386/libsaio/vbe.h
35 35 36 36 37 37 38 38 39 39 40 40 41 41	#ifndef __LIBSAIO_VBE_H␊ #define __LIBSAIO_VBE_H␊ ␊ #include "edid.h"␉␉␉//Azi:autoresolution␊ //#include "edid.h"␉␉␉//Azi:autoresolution <-- included in␊ #include "autoresolution.h"␊ ␊ #define MIN_VESA_VERSION 0x200␊

branches/azimutz/Chazi/i386/libsaio/acpi_patcher.c
3 3 4 4 5 5 6 6 7 7 8 8 9 9 10 10	*/␊ ␊ //#include "libsaio.h"␊ //#include "bootstruct.h"␊ #include "boot.h"␊ #include "bootstruct.h"␊ #include "acpi.h"␊ #include "efi_tables.h"␊ #include "fake_efi.h"␊

branches/azimutz/Chazi/i386/libsaio/allocate.c
22 22 23 23 24 24 25 26 27 25 28 26 27 28 29 29 30 30 31 31	* @APPLE_LICENSE_HEADER_END@␊ */␊ ␊ //#include "saio_internal.h"␊ //#include "device_tree.h" - included on bootstruct.h␊ #include "bootstruct.h"␊ #include "sl.h"␊ #include "saio_internal.h"␊ #include "bootstruct.h"␊ #include "device_tree.h"␊ ␊ static long gImageLastKernelAddr;␊ ␊

branches/azimutz/Chazi/i386/libsaio/hfs_compare.c
27 27 28 28 29 29 30 30 31 31 32 32 33 33 34	* DRI: Josh de Cesare␊ */␊ ␊ #include <sl.h>␊ //#include <sl.h>␊ #include "sl.h" //Azi:???␊ #include "hfs_CaseTables.h"␊ ␊ #if ! UNCOMPRESSED␊

branches/azimutz/Chazi/i386/libsaio/spd.c
7 7 8 8 9 9 10 11 10 12 11 13 12 14 13 14 15 15 16 16 17 17	*/␊ ␊ //#include "libsaio.h" - included on the header.␊ //#include "saio_internal.h" - included on bootstruct.h␊ #include "bootstruct.h"␊ #include "pci.h"␊ #include "platform.h"␊ #include "spd.h"␊ #include "saio_internal.h"␊ #include "bootstruct.h"␊ #include "memvendors.h"␊ ␊ #ifndef DEBUG_SPD␊

branches/azimutz/Chazi/i386/libsaio/libsaio.h
26 26 27 27 28 28 29 29 30 30 31 31 32	#ifndef __LIBSAIO_LIBSAIO_H␊ #define __LIBSAIO_LIBSAIO_H␊ ␊ //Azi: not used atm.␊ #include "libsa.h"␊ #include "memory.h"␊ #include "io_inline.h"␊

branches/azimutz/Chazi/i386/libsaio/spd.h
7 7 8 8 9 9 10 11 10 11 12 12 13 13 14 14	#ifndef __LIBSAIO_SPD_H␊ #define __LIBSAIO_SPD_H␊ ␊ #include "platform.h" // already suplies most of the dependencies.␊ //#include "libsaio.h"␊ #include "platform.h"␊ #include "io_inline.h"␊ ␊ void scan_spd(PlatformInfo_t *p);␊

branches/azimutz/Chazi/i386/libsaio/ufs.c
27 27 28 28 29 29 30 30 31 31 32 32 33 33 34	* DRI: Josh de Cesare␊ */␊ ␊ #include <sl.h>␊ //#include <sl.h>␊ #include "sl.h" //Azi:???␊ ␊ #include "ufs.h"␊ #include "ufs_byteorder.h"␊

branches/azimutz/Chazi/i386/libsaio/smbios_patcher.c
3 3 4 4 5 5 6 6 7 7 8 8 9 9 10 10	*/␊ ␊ //#include "libsaio.h" - included on the hearder.␊ //#include "bootstruct.h"␊ #include "boot.h"␊ #include "bootstruct.h"␊ #include "acpi.h"␊ #include "efi_tables.h"␊ #include "fake_efi.h"␊

branches/azimutz/Chazi/i386/libsaio/smbios_patcher.h
8 8 9 9 10 10 11 11 12 12 13 13 14 14	#ifndef __LIBSAIO_SMBIOS_PATCHER_H␊ #define __LIBSAIO_SMBIOS_PATCHER_H␊ ␊ //#include "libsaio.h" - not needed??␊ //#include "libsaio.h"␊ #include "SMBIOS.h"␊ ␊ /* From Foundation/Efi/Guid/Smbios/SmBios.h */␊

branches/azimutz/Chazi/i386/libsaio/pci_root.c
3 3 4 4 5 5 6 6 7 7 8 8 9 9 10 10	*/␊ ␊ //#include "libsaio.h"␊ //#include "bootstruct.h"␊ #include "boot.h"␊ #include "bootstruct.h"␊ ␊ #ifndef DEBUG_PCIROOT␊ #define DEBUG_PCIROOT 1␊

branches/azimutz/Chazi/i386/libsaio/usb.c
8 8 9 9 10 10 11 12 11 13 12 14 13 15 14 16 15 17 16	*/␊ ␊ //#include "libsaio.h"␊ #include "io_inline.h"␊ //---␊ //#include "bootstruct.h"␊ #include "boot.h"␊ #include "bootstruct.h"␊ #include "io_inline.h"␊ #include "pci.h"␊ ␊ #ifndef DEBUG_USB␊

branches/azimutz/Chazi/i386/libsaio/device_inject.c
6 6 7 7 8 8 9 9 10 10 11 11 12 12 13 13	*/␊ ␊ //#include "libsaio.h"␊ //#include "bootstruct.h"␊ #include "boot.h"␊ #include "bootstruct.h"␊ #include "pci.h"␊ #include "pci_root.h"␊ #include "device_inject.h"␊

branches/azimutz/Chazi/i386/libsaio/autoresolution.c

1 2 1 3 2 4 3 ... ... 15 14 16 15 17 16 18 19 20 17 21 18 22 19 23 20 24 21 25 22 26 23 27 24

␊ /* Copied from 915 resolution created by steve tomljenovic␊ *␊ * This code is based on the techniques used in :␊ */␊ ␊ //#include "libsaio.h"␊ #include "saio_internal.h"␊ //---␊ //#include "autoresolution.h" - included on ati_resolution.h␊ //#include "autoresolution.h" - included on *_resolution.h␊ #include "nvidia_resolution.h"␊ #include "ati_resolution.h"␊ #include "gma_resolution.h"␊ #include "../boot2/graphics.h"␊ #include "../boot2/graphics.h" //Azi:reminder␊ ␊ char * chipsetTypeNames[] = {␊ ␉"UNKNOWN", "830", "845G", "855GM", "865G", "915G", "915GM", "945G", "945GM", "945GME",␊

branches/azimutz/Chazi/i386/libsaio/autoresolution.h
18 18 19 19 20 20 21 22 21 23 22 24 23 25	␊ //#define AUTORES_DEBUG 1 // enable AutoResolution debug - review!␊ ␊ #include "libsa.h"␊ #include "saio_internal.h"␊ #include "edid.h"␊ ␊ #if DEBUG␊

branches/azimutz/Chazi/i386/libsaio/nvidia.c
49 49 50 50 51 51 52 52 53 53 54 54 55 55 56 56	*/␊ ␊ //#include "libsaio.h"␊ //#include "bootstruct.h"␊ #include "boot.h"␊ #include "bootstruct.h"␊ #include "pci.h"␊ #include "platform.h"␊ #include "device_inject.h"␊

branches/azimutz/Chazi/i386/libsaio/ntfs.c
23 23 24 24 25 25 26 26 27 27 28 28 29 29 30 30 31 31 32 33 32 34 33 35 34	* @APPLE_LICENSE_HEADER_END@␊ */␊ ␊ //#include "libsaio.h" - included on sl.h␊ //#include "libsaio.h"␊ #include "sl.h"␊ #include "ntfs_private.h"␊ ␊ #define BYTE_ORDER_MARK␉0xFEFF␊ ␊ #include "ntfs_private.h"␊ ␊ #define FS_TYPE␉␉␉"ntfs"␊ #define FS_NAME_FILE␉␉"NTFS"␊ ␊

branches/azimutz/Chazi/i386/libsaio/ufs_byteorder.c
31 31 32 32 33 33 34 35 34 36 35 36 37 37 38 38 39	#include <sys/vnode.h>␊ #include <ufs/ufs/dir.h>␊ #include <libkern/OSByteOrder.h>␊ ␊ //#include "libsaio.h" // ufs support reminder (check disk.c)␊ #include "ufs_byteorder.h"␊ #include "libsaio.h" // probably needed if ufs support is enabled.␊ ␊ #define␉swapBigLongToHost(thing) ((thing) = OSSwapBigToHostInt32(thing))␊ #define␉swapBigShortToHost(thing) ((thing) = OSSwapBigToHostInt16(thing))␊

branches/azimutz/Chazi/i386/libsaio/ati.c
22 22 23 23 24 24 25 25 26 26 27 28 27 29 28 30 29	␊ ␊ //#include "libsaio.h"␊ //---␊ //#include "bootstruct.h"␊ #include "boot.h"␊ #include "bootstruct.h"␊ #include "pci.h"␊ #include "platform.h"␊ #include "device_inject.h"␊

branches/azimutz/Chazi/i386/libsaio/sys.c

54 54 55 55 56 56 57 58 57 58 59 59 60 60 61 61 62 63 62 64 63 65 66 64 67 65 66 68 67 69 68 70 71 69 72 70 73 71 74 72 75 73 76 74 75 77 78 79 76 80 77 81 78 82

*␉@(#)sys.c␉7.1 (Berkeley) 6/5/86␊ */␊ ␊ /* Copyright 2007 VMware Inc.␊ "Preboot" ramdisk support added by David Elliott␊ /*␊ * Copyright 2007 VMware Inc.␊ * "Preboot" ramdisk support added by David Elliott␊ */␊ ␊ #include <AvailabilityMacros.h>␊ #include <uuid/uuid.h>␊ ␊ //#include "libsaio.h"␊ //#include "bootstruct.h"␊ #include "boot.h"␊ #include "bootstruct.h"␊ #include "disk.h"␊ #include "ramdisk.h"␊ #include "xml.h"␊ ␊ #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5␊ # include <Kernel/libkern/crypto/md5.h>␊ #else␊ # include <sys/md5.h>␊ #endif␊ #include <uuid/uuid.h>␊ #if 0 /* No OS X release has ever included this. */␊ ␊ /* No OS X release has ever included this. */␊ #if 0␊ #include <Kernel/uuid/namespace.h>␊ #else␊ /* copied from uuid/namespace.h, just like BootX's fs.c does. */␊

branches/azimutz/Chazi/i386/libsaio/load.c
30 30 31 31 32 32 33 33 34 34 35 35 36 36 37	#include <mach-o/loader.h>␊ #include <mach/machine/thread_status.h>␊ ␊ #include <sl.h>␊ //#include <sl.h>␊ #include "sl.h" //Azi:???␊ ␊ static long DecodeSegment(long cmdBase, unsigned int*load_addr, unsigned int *load_size);␊ static long DecodeUnixThread(long cmdBase, unsigned int *entry);␊

branches/azimutz/Chazi/i386/libsaio/sl.h
28 28 29 29 30 30 31 32 31 32 33 34 35 36 33 37 34 38 35 39	#include <sys/types.h>␊ #include <sys/param.h>␊ #include <sys/vnode.h>␊ #include "libsaio.h" - check later; sl.h is included in many files!␊ ␊ //#include "libsaio.h"␊ #include "libsa.h"␊ #include "memory.h"␊ #include "saio_internal.h"␊ ␊ #define SWAP_BE16(x) OSSwapBigToHostInt16(x)␊ #define SWAP_LE16(x) OSSwapLittleToHostInt16(x)␊ #define SWAP_BE32(x) OSSwapBigToHostInt32(x)␊

branches/azimutz/Chazi/i386/libsaio/platform.c
4 4 5 5 6 6 7 7 8 8 9 9 10 10 11 11 12 12	* AsereBLN: cleanup␊ */␊ ␊ //#include "libsaio.h" - both bootstruct.h, platform.h, pci.h can resolve dependencies.␊ //#include "libsaio.h"␊ //#include "bootstruct.h"␊ #include "boot.h"␊ #include "bootstruct.h"␊ #include "pci.h"␊ #include "platform.h"␊ #include "cpu.h"␊

branches/azimutz/Chazi/i386/libsaio/cpu.c
3 3 4 4 5 5 6 6 7 7 8 8 9 9	* AsereBLN: 2009: cleanup and bugfix␊ */␊ ␊ //#include "libsaio.h" - was included on both of the remaining; platform.h resolves dependencies.␊ //#include "libsaio.h"␊ #include "platform.h"␊ #include "cpu.h"␊ ␊

branches/azimutz/Chazi/i386/libsaio/disk.c

44 44 45 45 46 46 47 48 49 47 48 49 50 50 51 51 52 53 54 55 56 57 58 52 59 53 60 54 61 ... ... 56 63 57 64 58 65 66 67 59 68 60 61 62 63 69 70 64 71 65 72 66 73 74 67 75 68 76 69 77 70 78 71 72 79 73 80 81 82 83 74 84 75 76 77 78 85 79 86 80 87 81 82 83 84 85 88 86 89 87 90

* All rights reserved.␊ */␊ ␊ /* Copyright 2007 VMware Inc.␊ "Preboot" ramdisk support added by David Elliott␊ GPT support added by David Elliott. Based on IOGUIDPartitionScheme.cpp.␊ /*␊ * Copyright 2007 VMware Inc.␊ * "Preboot" ramdisk support added by David Elliott␊ * GPT support added by David Elliott. Based on IOGUIDPartitionScheme.cpp.␊ */␊ ␊ //#define UFS_SUPPORT 1 //Azi: error: duplicate case value␊ ␊ #include <limits.h>␊ #include <IOKit/storage/IOApplePartitionScheme.h>␊ #include <IOKit/storage/IOGUIDPartitionScheme.h>␊ ␊ // Allow UFS_SUPPORT to be overridden with preprocessor option.␊ #ifndef UFS_SUPPORT␊ // zef: Disabled UFS support␊ #endif␊ ␊ //#include "libsaio.h"␊ //#include "bootstruct.h"␊ #include "boot.h"␊ #include "memory.h"␊ //---␊ #include "boot.h"␊ #include "bootstruct.h"␊ #include "fdisk.h"␊ ␊ #if UFS_SUPPORT␊ #include "ufs.h"␊ #endif␊ ␊ #include "hfs.h"␊ #include "ntfs.h"␊ #include "msdos.h"␊ #include "ext2fs.h"␊ ␊ #include "xml.h"␊ #include "disk.h"␊ // For EFI_GUID␊ #include "efi.h"␊ #include "efi_tables.h"␊ ␊ #include <limits.h>␊ #include <IOKit/storage/IOApplePartitionScheme.h>␊ #include <IOKit/storage/IOGUIDPartitionScheme.h>␊ typedef struct gpt_hdr gpt_hdr;␊ typedef struct gpt_ent gpt_ent;␊ ␊ // For EFI_GUID␊ #include "efi.h"␊ #include "efi_tables.h"␊ ␊ #define PROBEFS_SIZE BPS * 4 /* buffer size for filesystem probe */␊ #define CD_BPS 2048 /* CD-ROM block size */␊ #define N_CACHE_SECS (BIOS_LEN / BPS) /* Must be a multiple of 4 for CD-ROMs */␊

branches/azimutz/Chazi/i386/libsaio/pci_setup.c
1 1 2 2 3 3 4 4 5 5 6 6 7 7	␊ //#include "libsaio.h"␊ //#include "bootstruct.h"␊ #include "boot.h"␊ #include "bootstruct.h"␊ #include "pci.h"␊ #include "nvidia.h"␊ #include "ati.h"␊

branches/azimutz/Chazi/i386/libsaio/nvidia_resolution.h

1 1 2 2 3 3 4 4 5 5 ... ... 7 7 8 8 9 9 10 11 10 11 12 12 13 13 14 14 15 15 16 16 17

/*␊ * nviviaresolution.h␊ * nvidia_resolution.h␊ * ␊ *␊ * Created by Le Bidou on 19/03/10.␊ *␊ */␊ ␊ #ifndef _NVDA_RESOLUTION_HEADER_␊ #define _NVDA_RESOLUTION_HEADER_␊ #ifndef _NVIDIA_RESOLUTION_HEADER_␊ #define _NVIDIA_RESOLUTION_HEADER_␊ ␊ #include "libsaio.h" // not worth it; 4 out of 5 are needed.␊ //#include "libsaio.h"␊ #include "io_inline.h"␊ #include "autoresolution.h"␊ ␊ #define NVIDIA_SIGNATURE "NVIDIA Corp"␊

branches/azimutz/Chazi/i386/libsaio/cache.c
27 27 28 28 29 29 30 31 30 31 32 32 33 33 34 34 35	* DRI: Josh de Cesare␊ */␊ ␊ #include <sl.h>␊ // #include <fs.h>␊ //#include <sl.h>␊ #include "sl.h" //Azi:???␊ //#include <fs.h>␊ ␊ struct CacheEntry {␊ CICell ih;␊

branches/azimutz/Chazi/i386/libsaio/edid.c
8 8 9 9 10 10 11 12 11 12 13 13 14 14 15 15 16 16 17 17	*/␊ ␊ ␊ //#include "libsaio.h" --> bootstruct.h␊ //#include "bootstruct.h" - included on graphics.h␊ //#include "libsaio.h"␊ //#include "bootstruct.h"␊ #include "boot.h"␊ #include "graphics.h"␊ #include "boot.h"␊ ␊ ␊ //static biosBuf_t bb;␊

branches/azimutz/Chazi/i386/libsaio/stringTable.c
27 27 28 28 29 29 30 30 31 31 32 32 33 33 34 34	*/␊ ␊ //#include "libsaio.h"␊ //#include "bootstruct.h"␊ #include "boot.h"␊ #include "bootstruct.h"␊ #include "xml.h"␊ ␊ extern char *Language;␊

branches/azimutz/Chazi/i386/libsaio/biosfn.c
40 40 41 41 42 42 43 44 45 43 46 44 45 47 46 47 48 48 49 49 50 50	- Added ebiosEjectMedia␊ */␊ ␊ //#include "libsaio.h"␊ //#include "libsa.h"␊ //#include "saio_internal.h"␊ #include "bootstruct.h"␊ //#include "libsaio.h"␊ #include "memory.h"␊ #include "libsa.h"␊ #include "saio_internal.h"␊ ␊ #define MAX_DRIVES 8␊ ␊

branches/azimutz/Chazi/i386/libsaio/convert.h
9 9 10 10 11 11 12 13 12 14 13 15 14 16 15	␊ //#include "libsaio.h"␊ #include "libsa.h"␊ #include "saio_internal.h" // "external" to verbose function␊ //---␊ #include "saio_internal.h"␊ #include "efi.h"␊ ␊ #define UUID_LEN␉16␊

branches/azimutz/Chazi/i386/libsaio/fake_efi.c
4 4 5 5 6 6 7 7 8 8 9 9 10 10 11 11	*/␊ ␊ //#include "libsaio.h"␊ //#include "bootstruct.h"␊ #include "boot.h"␊ #include "bootstruct.h"␊ #include "efi.h"␊ #include "acpi.h"␊ #include "fake_efi.h"␊

branches/azimutz/Chazi/i386/libsaio/gma_resolution.h
11 11 12 12 13 13 14 15 16 14 17 15 18 16	#define _GMA_RESOLTUION_H_␊ ␊ //#include "libsaio.h"␊ #include "saio_internal.h"␊ //---␊ #include "autoresolution.h"␊ ␊ #define MODE_TABLE_OFFSET_845G 617␊

branches/azimutz/Chazi/i386/boot2/ramdisk.h
7 7 8 8 9 9 10 11 12 13 10 14 11 15 12	#ifndef __BOOT_RAMDISK_H␊ #define __BOOT_RAMDISK_H␊ ␊ //#include "libsaio.h"␊ #include "libsa.h"␊ #include "saio_types.h"␊ #include "memory.h"␊ ␊ #define RAMDISKCONFIG_FILENAME "rd(0,0)/RAMDisk.plist"␊

branches/azimutz/Chazi/i386/boot2/resume.c
7 7 8 8 9 9 10 10 11 12 11 13 12 14 13 14 15 15 16 16 17 17	*␊ */␊ ␊ #include "libsa.h"␊ //#include "libsa.h"␊ //#include "bootstruct.h"␊ #include "boot.h"␊ #include "IOHibernatePrivate.h"␊ #include "memory.h"␊ #include "bootstruct.h"␊ #include "boot.h"␊ #include "pci.h"␊ ␊ extern int previewTotalSectors;␊

branches/azimutz/Chazi/i386/boot2/graphics.c
26 26 27 27 28 28 29 29 30 30 31 31 32	* All rights reserved.␊ */␊ ␊ #include "boot.h"␊ #include "appleClut8.h"␊ #include "gui.h"␊ #include "IOHibernatePrivate.h"␊

branches/azimutz/Chazi/i386/boot2/boot.c

49 49 50 50 51 51 52 52 53 53 54 54 55 56 57 58 55 59 56 60 61 57 58 59 60 62 61 63 62 64 63

* Reworked again by Curtis Galloway (galloway@NeXT.com)␊ */␊ ␊ ␊ //#include "bootstruct.h"␊ //#include "libsa.h"␊ #include "boot.h"␊ #include "bootstruct.h"␊ #include "fake_efi.h"␊ #include "sl.h"␊ #include "libsa.h"␊ #include "ramdisk.h"␊ #include "ramdisk.h" // bootstruct.h: memory.h instead of saio_internal.h␊ #include "gui.h"␊ #include "platform.h"␊ #include "modules.h"␊ #include "fake_efi.h"␊ #include "platform.h" // bootstruct.h - device_tree.h␊ #include "sl.h" // bootstruct.h: memory.h instead of saio_types.h␊ ␊ long gBootMode; /* defaults to 0 == kBootModeNormal */␊ bool gOverrideKernel;␊

branches/azimutz/Chazi/i386/boot2/graphics.h

7 7 8 8 9 9 10 11 12 10 13 11 12 13 14 14 15 16 15 17 16 18 17 19 18 19 20 21 20 22 21 23 22

*␊ */␊ ␊ #ifndef __BOOT_GRAPHICS_H␊ #define __BOOT_GRAPHICS_H␊ ␊ //#include "libsaio.h"␊ #include "libsa.h"␊ //---␊ #include "boot.h" // was included on graphic_utils.h␊ #include "bootstruct.h"␊ //#include "bootstruct.h"␊ //#include "boot.h"␊ #include "saio_types.h"␊ #include "graphic_utils.h"␊ #include "vbe.h"␊ ␊ #ifndef __BOOT_GRAPHICS_H␊ #define __BOOT_GRAPHICS_H␊ ␊ #define DEFAULT_SCREEN_WIDTH 1024␊ #define DEFAULT_SCREEN_HEIGHT 768␊ ␊

branches/azimutz/Chazi/i386/boot2/modules.c
4 4 5 5 6 6 7 8 9 7 8 10 9 11 10 12 11	*/␊ ␊ //#include "boot.h"␊ #include "libsa.h"␊ #include "saio_internal.h"␊ //---␊ //#include "libsa.h"␊ //#include "saio_internal.h"␊ #include "bootstruct.h"␊ #include "multiboot.h"␊ #include "modules.h"␊

branches/azimutz/Chazi/i386/boot2/boot.h

30 30 31 31 32 32 33 34 33 35 34 36 35 37 36 37 38 39 38 40 39 41 40 42

#define __BOOT2_BOOT_H␊ ␊ //Azi: keep it minimal for now.␊ // Todo: check bootstruct.h, sl.h, platform.h, next; include bootstruct here??␊ // don't include headers like libsaio.h on other headers?!␊ // Todo: don't include headers like boot.h on other headers, unless...!␊ // move keys to the headers of the files they're in, if they have it!?␊ #include "saio_internal.h" // the only one needed by boot.h it self, afaics.␊ // check header wrappers...␊ ␊ //#include "saio_internal.h" // the only one needed by boot.h it self, afaics.␊ #include "bootstruct.h"␊ ␊ /*␊ * Default names - these end with "Name" (easier to sort them).␊ */␊

branches/azimutz/Chazi/i386/boot2/modules.h
4 4 5 5 6 6 7 8 9 7 10 8 11 9 12 10 11 12 13 13 14 14 15 15	*␊ */␊ ␊ #ifndef __BOOT_MODULES_H␊ #define __BOOT_MODULES_H␊ ␊ #include <mach-o/loader.h>␊ #include <mach-o/nlist.h>␊ ␊ #ifndef __BOOT_MODULES_H␊ #define __BOOT_MODULES_H␊ ␊ extern unsigned long long textAddress;␊ extern unsigned long long textSection;␊ ␊

branches/azimutz/Chazi/i386/boot2/drivers.c
33 33 34 34 35 35 36 37 38 36 39 37 38 39 40 40 41 41 42 42 43 43	#include <libkern/OSByteOrder.h>␊ #include <mach/machine.h>␊ ␊ //#include "bootstruct.h"␊ //#include "ramdisk.h"␊ #include "boot.h"␊ #include "sl.h"␊ #include "boot.h"␊ #include "bootstruct.h"␊ #include "xml.h"␊ //#include "ramdisk.h"␊ ␊ struct Module { ␊ struct Module *nextModule;␊

branches/azimutz/Chazi/i386/boot2/mboot.c

3 3 4 4 5 5 6 7 8 6 9 7 10 8 11 9 12 10 13 11 ... ... 354 352 355 353 356 354 355 357 356 358 357 359 358

*/␊ ␊ //#include "libsaio.h"␊ #include "libsa.h"␊ #include "memory.h"␊ //---␊ //#include "bootstruct.h"␊ #include "boot.h"␊ #include "bootstruct.h"␊ #include "memory.h"␊ #include "mboot.h"␊ ␊ int multiboot_timeout=0;␊ kASCIIKeyMask = 0x7f␊ };␊ ␊ //Azi:reminder␊ // This is the meat of our implementation. It grabs the boot device from␊ // the multiboot_info and returns it as is. If it fails it returns␊ // BAD_BOOT_DEVICE. We can call an awful lot of libsa and libsaio but␊

branches/azimutz/Chazi/i386/boot2/gui.c
8 8 9 9 10 10 11 11 12 12 13 13 14	*␊ */␊ ␊ #include "boot.h"␊ #include "gui.h"␊ #include "appleboot.h"␊ #include "vers.h"␊

branches/azimutz/Chazi/i386/boot2/gui.h
8 8 9 9 10 10 11 12 13 11 14 12 15 13 16 14 15 16 17 17 18 18 19 19	*␊ */␊ ␊ #ifndef __BOOT2_GUI_H␊ #define __BOOT2_GUI_H␊ ␊ #include "graphics.h"␊ #include "picopng.h"␊ ␊ #ifndef __BOOT2_GUI_H␊ #define __BOOT2_GUI_H␊ ␊ #define CHARACTERS_COUNT␉223␊ ␊ #define BOOT_NORMAL␉␉0␊

branches/azimutz/Chazi/i386/boot2/ramdisk.c
4 4 5 5 6 6 7 7 8 8 9 9 10 10 11 11	*␊ */␊ ␊ //#include "bootstruct.h"␊ #include "boot.h"␊ #include "bootstruct.h"␊ #include "multiboot.h"␊ #include "ramdisk.h"␊ ␊

branches/azimutz/Chazi/i386/boot2/lzss.c
40 40 41 41 42 42 43 43 44 44 45 45 46 46 47	* DRI: Josh de Cesare␊ */␊ ␊ #include <sl.h>␊ //#include <sl.h> // can't find this guy on the system; maybe we should stop looking for it there first!?␊ #include "sl.h" //Azi:???␊ ␊ #define N 4096 /* size of ring buffer - must be power of 2 */␊ #define F 18 /* upper limit for match_length */␊

branches/azimutz/Chazi/i386/boot2/options.c
22 22 23 23 24 24 25 25 26 26 27 27 28	* @APPLE_LICENSE_HEADER_END@␊ */␊ ␊ #include "boot.h"␊ #include "fdisk.h"␊ #include "ramdisk.h"␊ #include "gui.h"␊

branches/azimutz/Chazi/i386/modules/KernelPatcher/kernel_patcher.c
3 3 4 4 5 5 6 7 8 6 7 9 8 10 9 11 10 ... ... 285 284 286 285 287 286 288 287 289 288 290 289 291 290	*␊ */␊ ␊ #include "boot.h"␊ #include "bootstruct.h" // replaces libsaio.h.␊ //#include "libsaio.h"␊ #include "boot.h"␊ #include "kernel_patcher.h"␊ #include "platform.h"␊ #include "modules.h"␊ ␉␊ ␉␊ ␉␊ ␉UInt32 jumpLocation = 0;␊ //␉UInt32 jumpLocation = 0; unused for now␊ ␉␊ ␉␊ ␉if(symbol == 0 || symbol->addr == 0)␊

branches/azimutz/Chazi/i386/modules/KernelPatcher/kernel_patcher.h
3 3 4 4 5 5 6 7 8 6 9 7 10 8 11 9 10 11 12 12 13 13 14 14	*␊ */␊ ␊ #ifndef __BOOT2_KERNEL_PATCHER_H␊ #define __BOOT2_KERNEL_PATCHER_H␊ ␊ #include <mach-o/loader.h>␊ #include <mach-o/nlist.h>␊ ␊ #ifndef __BOOT2_KERNEL_PATCHER_H␊ #define __BOOT2_KERNEL_PATCHER_H␊ ␊ #define CPUID_MODEL_ANY␉␉0x00␊ #define CPUID_MODEL_UNKNOWN␉0x01␊ ␊

branches/azimutz/Chazi/i386/modules/HelloWorld/HelloWorld.c
6 6 7 7 8 8 9 10 9 11 10 12 11	//#include "libsaio.h"␊ #include "saio_internal.h"␊ #include "saio_types.h"␊ //---␊ #include "modules.h"␊ ␊ ␊

Download the corresponding diff file