/SPARTAN/trunk/arch/ppc/src/drivers/ofw.c |
---|
29,14 → 29,13 |
#include <arch/drivers/ofw.h> |
#include <stdarg.h> |
ihandle ofw_chosen; |
ihandle ofw_stdout; |
ofw_entry ofw; |
phandle ofw_chosen; |
ihandle ofw_stdout; |
void ofw_init(void) |
{ |
ofw_chosen = ofw_find_device("/chosen"); |
ofw_chosen = ofw_call("finddevice", 1, 1, "/chosen"); |
if (ofw_chosen == -1) |
ofw_done(); |
53,7 → 52,7 |
int ofw_call(const char *service, const int nargs, const int nret, ...) |
{ |
va_list list; |
ofw_args_t args; |
struct ofw_args_t args; |
int i; |
args.service = service; |
78,19 → 77,9 |
if (ofw_stdout == 0) |
return; |
ofw_call("write", 3, 1, ofw_stdout, &ch, 1); |
ofw_call("write", 3, 1, ofw_stdout, ch, 1); |
} |
phandle ofw_find_device(const char *name) |
{ |
return ofw_call("finddevice", 1, 1, name); |
} |
int ofw_get_property(const phandle device, const char *name, void *buf, const int buflen) |
{ |
return ofw_call("getprop", 4, 1, device, name, buf, buflen); |
} |
void putchar(const char ch) |
{ |
ofw_putchar(ch); |
/SPARTAN/trunk/arch/ppc/src/asm.s |
---|
26,8 → 26,6 |
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
# |
#include <arch/asm/macro.h> |
.text |
.global cpu_halt |
/SPARTAN/trunk/arch/ppc/src/dummy.s |
---|
29,15 → 29,20 |
.text |
.global memcopy |
.global cpu_priority_high |
.global cpu_priority_low |
.global cpu_priority_read |
.global cpu_priority_restore |
.global memsetb |
.global context_save |
.global context_restore |
.global userspace |
.global before_thread_runs_arch |
.global panic_printf |
.global cpu_identify |
.global cpu_arch_init |
.global cpu_print_report |
.global get_memory_size |
.global arch_pre_mm_init |
.global arch_post_mm_init |
.global arch_late_init |
46,6 → 51,9 |
.global dummy |
memcopy: |
cpu_priority_high: |
cpu_priority_low: |
cpu_priority_restore: |
cpu_priority_read: |
memsetb: |
context_save: |
54,9 → 62,11 |
userspace: |
calibrate_delay_loop: |
asm_delay_loop: |
panic_printf: |
cpu_identify: |
cpu_arch_init: |
cpu_print_report: |
get_memory_size: |
arch_pre_mm_init: |
arch_post_mm_init: |
arch_late_init: |
/SPARTAN/trunk/arch/ppc/src/start.S |
---|
26,8 → 26,6 |
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
# |
#include <arch/asm/macro.h> |
.section K_TEXT_START |
.global kernel_image_start |
/SPARTAN/trunk/arch/ppc/src/mm/memory_init.c |
---|
File deleted |
/SPARTAN/trunk/arch/ppc/include/asm/macro.h |
---|
74,9 → 74,6 |
#define r30 30 |
#define r31 31 |
/* GPR Aliases */ |
#define sp 1 |
/* Floating Point Registers (FPRs) */ |
#define fr0 0 |
#define fr1 1 |
/SPARTAN/trunk/arch/ppc/include/drivers/ofw.h |
---|
35,72 → 35,16 |
typedef __u32 ofw_arg_t; |
typedef __u32 ihandle; |
typedef __u32 phandle; |
/** OpenFirmware command structure |
* |
*/ |
typedef struct { |
const char *service; /**< Command name */ |
__u32 nargs; /**< Number of in arguments */ |
__u32 nret; /**< Number of out arguments */ |
ofw_arg_t args[MAX_OFW_ARGS]; /**< List of arguments */ |
} ofw_args_t; |
struct ofw_args_t { |
const char *service; |
int nargs; |
int nret; |
ofw_arg_t args[MAX_OFW_ARGS]; |
}; |
/** OpenFirmware device address range structure |
* |
*/ |
typedef struct { |
__u32 space; |
__u32 address; |
__u32 size; |
} address_range_t; |
typedef void (*ofw_entry)(struct ofw_args_t *); |
/** OpenFirmware device interrupt structure |
* |
*/ |
typedef struct { |
__u32 line; /**< Interrupt number */ |
__u32 flags; /**< Interrupt flags/logic */ |
} interrupt_info_t; |
/** OpenFirmware property structure |
* |
*/ |
typedef struct property_t { |
char *name; /**< Property name */ |
__u32 length; /**< Value length */ |
char *value; /**< Property value */ |
struct property_t *next; /**< Next property in list */ |
} property_t; |
/** OpenFirmware device descritor |
* |
*/ |
typedef struct device_node_t { |
char *name; /**< Device name */ |
char *type; /**< Device type */ |
phandle node; /**< Device handle */ |
__u32 n_addrs; /**< Number of address ranges */ |
address_range_t *addrs; /**< Address ranges list */ |
__u32 n_intrs; /**< Number of interrupts */ |
interrupt_info_t *intrs; /**< Interrupts list */ |
char *full_name; /**< Device full name */ |
property_t *properties; /**< Device properties */ |
struct device_node_t *parent; /**< Parent device */ |
struct device_node_t *child; /**< First child in tree */ |
struct device_node_t *sibling; /**< Next device on tree level */ |
struct device_node_t *next; /**< Next device of the same type */ |
struct device_node_t *next_all; /**< Next device in list of all nodes */ |
} device_node_t; |
typedef void (*ofw_entry)(ofw_args_t *); |
extern ofw_entry ofw; |
extern void ofw_init(void); |
107,8 → 51,6 |
extern void ofw_done(void); |
extern int ofw_call(const char *service, const int nargs, const int nret, ...); |
extern void ofw_putchar(const char ch); |
extern phandle ofw_find_device(const char *name); |
extern int ofw_get_property(const phandle device, const char *name, void *buf, const int buflen); |
extern void putchar(const char ch); |
#endif |
/SPARTAN/trunk/arch/ppc/include/asm.h |
---|
1,5 → 1,5 |
/* |
* Copyright (C) 2005 Martin Decky |
* Copyright (C) 2005 Jakub Jermar |
* All rights reserved. |
* |
* Redistribution and use in source and binary forms, with or without |
32,45 → 32,6 |
#include <arch/types.h> |
#include <config.h> |
/** Set priority level low |
* |
* Enable interrupts and return previous |
* value of EE. |
*/ |
static inline pri_t cpu_priority_low(void) { |
pri_t v; |
__asm__ volatile ( |
"\n" |
: "=r" (v) |
); |
return v; |
} |
/** Set priority level high |
* |
* Disable interrupts and return previous |
* value of EE. |
*/ |
static inline pri_t cpu_priority_high(void) { |
pri_t v; |
__asm__ volatile ( |
"\n" |
: "=r" (v) |
); |
return v; |
} |
/** Restore priority level |
* |
* Restore EE. |
*/ |
static inline void cpu_priority_restore(pri_t pri) { |
__asm__ volatile ( |
"\n" |
: : "r" (pri) |
); |
} |
/* TODO: implement the real stuff */ |
static inline __address get_stack_base(void) |
{ |
/SPARTAN/trunk/arch/ppc/Makefile.inc |
---|
16,12 → 16,10 |
arch_sources= \ |
arch/ppc.c \ |
arch/debug/panic.s \ |
arch/fpu_context.c \ |
arch/dummy.s \ |
arch/start.S \ |
arch/asm.s \ |
arch/mm/frame.c \ |
arch/mm/memory_init.c \ |
arch/mm/page.c \ |
arch/drivers/ofw.c |