Changeset 46c20c8 in mainline for boot/arch/ia64/include/types.h


Ignore:
Timestamp:
2010-11-26T20:08:10Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
45df59a
Parents:
fb150d78 (diff), ffdd2b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 moved

Legend:

Unmodified
Added
Removed

  • boot/arch/ia64/include/types.h

    rfb150d78 r46c20c8  
    2727 */
    2828
    29 #ifndef BOOT_mips32_MAIN_H_
    30 #define BOOT_mips32_MAIN_H_
     29#ifndef BOOT_ia64_TYPES_H_
     30#define BOOT_ia64_TYPES_H_
    3131
    32 #define CPUMAP               0x80001000
    33 #define INITIAL_STACK        0x80002000
    34 #define MSIM_DORDER_ADDRESS  0xb0000004
     32#define TASKMAP_MAX_RECORDS             32
     33#define BOOTINFO_TASK_NAME_BUFLEN       32
     34#define MEMMAP_ITEMS                    128     
    3535
    36 #define TASKMAP_MAX_RECORDS  32
    37 #define CPUMAP_MAX_RECORDS   32
    38 
    39 #ifndef __ASM__
    40 
    41 /** Size of buffer for storing task name in task_t. */
    42 #define BOOTINFO_TASK_NAME_BUFLEN 32
    43 
    44 /** Struct holding information about single loaded task. */
    45 typedef struct {
    46         /** Address where the task was placed. */
    47         void *addr;
    48         /** Size of the task's binary. */
    49         unsigned int size;
    50         /** Task name. */
    51         char name[BOOTINFO_TASK_NAME_BUFLEN];
    52 } task_t;
     36typedef uint64_t size_t;
     37typedef uint64_t unative_t;
     38typedef uint64_t uintptr_t;
    5339
    5440typedef struct {
    55         unsigned int cpumap;
    56         unsigned int cnt;
    57         task_t tasks[TASKMAP_MAX_RECORDS];
     41        void *addr;
     42        size_t size;
     43        char name[BOOTINFO_TASK_NAME_BUFLEN];
     44} binit_task_t;
     45
     46typedef struct {
     47        size_t cnt;
     48        binit_task_t tasks[TASKMAP_MAX_RECORDS];
     49} binit_t;
     50
     51typedef struct {
     52        unsigned int type;
     53        unsigned long base;
     54        unsigned long size;
     55} efi_memmap_item_t;
     56
     57typedef struct {
     58        binit_t taskmap;
     59
     60        efi_memmap_item_t memmap[MEMMAP_ITEMS];
     61        unsigned int memmap_items;
     62
     63        unative_t *sapic;
     64        unsigned long sys_freq;
     65        unsigned long freq_scale;
     66        unsigned int wakeup_intno;
     67        int hello_configured;
    5868} bootinfo_t;
    5969
    60 extern void start(void);
    61 extern void bootstrap(void);
    62 
    6370#endif
    64 
    65 #endif
Note: See TracChangeset for help on using the changeset viewer.