Changeset 94d614e in mainline for kernel/arch/sparc64/include


Ignore:
Timestamp:
2006-07-13T17:32:38Z (19 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a5f76758
Parents:
63cda71
Message:

Remove OpenFirmware calls from kernel/ entirely.

Switch the sparc64 port to use bootinfo.

Copy memcpy from boot/ to sparc64 kernel/ and
adjust it for memcpy_from/to_uspace.

Location:
kernel/arch/sparc64/include
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/sparc64/include/boot/boot.h

    r63cda71 r94d614e  
    3333 */
    3434
    35 #ifndef __sparc64_BOOT_H__
    36 #define __sparc64_BOOT_H__
     35#ifndef KERN_sparc64_BOOT_H_
     36#define KERN_sparc64_BOOT_H_
     37
    3738
    3839#define VMA                     0x400000
    3940#define LMA                     VMA
     41
     42#ifndef __LINKER__
     43
     44#include <arch/types.h>
     45#include <typedefs.h>
     46
     47#define TASKMAP_MAX_RECORDS     32
     48#define MEMMAP_MAX_RECORDS      32
     49
     50typedef struct {
     51        void * addr;
     52        uint32_t size;
     53} utask_t;
     54
     55typedef struct {
     56        uint32_t count;
     57        utask_t tasks[TASKMAP_MAX_RECORDS];
     58} taskmap_t;
     59
     60typedef struct {
     61        uintptr_t start;
     62        uint32_t size;
     63} memzone_t;
     64
     65typedef struct {
     66        uint32_t total;
     67        uint32_t count;
     68        memzone_t zones[MEMMAP_MAX_RECORDS];
     69} memmap_t;
     70
     71typedef struct {
     72        uintptr_t addr;
     73        uint32_t width;
     74        uint32_t height;
     75        uint32_t bpp;
     76        uint32_t scanline;
     77} screen_t;
     78
     79typedef struct {
     80        uintptr_t addr;
     81        uint32_t size;
     82} keyboard_t;
     83
     84typedef struct {
     85        taskmap_t taskmap;
     86        memmap_t memmap;
     87        screen_t screen;
     88        keyboard_t keyboard;
     89} bootinfo_t;
     90
     91extern bootinfo_t bootinfo;
     92
     93#endif
    4094
    4195#endif

  • kernel/arch/sparc64/include/drivers/fb.h

    r63cda71 r94d614e  
    3636#define KERN_sparc64_FB_H_
    3737
    38 #define FB_PHYS_ADDRESS         0x1c901000000ULL
    39 
    40 #define FB_X_RES                1152
    41 #define FB_Y_RES                900
    42 
    43 #define FB_COLOR_DEPTH          8
    44 
    4538#endif
    4639

  • kernel/arch/sparc64/include/drivers/i8042.h

    r63cda71 r94d614e  
    3838#include <arch/types.h>
    3939
    40 #define KBD_PHYS_ADDRESS        0x1fff8904000ULL
    41 
    4240#define STATUS_REG      4
    4341#define COMMAND_REG     4

  • kernel/arch/sparc64/include/drivers/tick.h

    r63cda71 r94d614e  
    2727 */
    2828
    29  /** @addtogroup sparc64       
     29/** @addtogroup sparc64
    3030 * @{
    3131 */
    … …  
    4545#endif
    4646
    47  /** @}
     47/** @}
    4848 */
    49 
Note: See TracChangeset for help on using the changeset viewer.