Added the arch_cpu_idle() call.

Updated stage2_priv.h to reflect geist's, and freston's changes.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@306 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2002-07-18 14:15:47 +00:00
parent 92622c9c58
commit 4635c565e4
3 changed files with 11 additions and 9 deletions
+4
View File
@@ -2,6 +2,7 @@
** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
** Distributed under the terms of the NewOS License.
*/
#ifndef _KERNEL_ARCH_CPU_H
#define _KERNEL_ARCH_CPU_H
@@ -28,6 +29,7 @@ int arch_cpu_preboot_init(kernel_args *ka);
int arch_cpu_init(kernel_args *ka);
int arch_cpu_init2(kernel_args *ka);
void reboot(void);
#ifdef __cplusplus
}
#endif
@@ -41,6 +43,8 @@ int arch_cpu_user_strcpy(char *to, const char *from, addr *fault_handler);
int arch_cpu_user_strncpy(char *to, const char *from, size_t size, addr *fault_handler);
int arch_cpu_user_memset(void *s, char c, size_t count, addr *fault_handler);
void arch_cpu_idle(void);
#include <arch_cpu.h>
#endif /* _KERNEL_ARCH_CPU_H */
@@ -2,20 +2,22 @@
** Copyright 2001, Travis Geiselbrecht. All rights reserved.
** Distributed under the terms of the NewOS License.
*/
#ifndef _STAGE2_PRIV_H
#define _STAGE2_PRIV_H
#include <stage2.h>
#include <ktypes.h>
extern void _start(unsigned int mem, int in_vesa, unsigned int vesa_ptr);
extern void clearscreen(void);
extern void kputs(const char *str);
extern int dprintf(const char *fmt, ...);
extern void sleep(long long time);
extern long long system_time(void);
extern void sleep(uint64 time);
extern uint64 system_time(void);
extern void execute_n_instructions(int count);
void system_time_setup(long a);
long long rdtsc();
uint64 rdtsc();
unsigned int get_eflags(void);
void set_eflags(unsigned int val);
void cpuid(unsigned int selector, unsigned int *data);
@@ -37,8 +39,6 @@ void cpuid(unsigned int selector, unsigned int *data);
#define SCREEN_HEIGHT 24
#define ADDR_MASK 0xfffff000
#define NULL ((void *)0)
#define _PACKED __attribute__((packed))
#define IDT_LIMIT 0x800
@@ -196,5 +196,4 @@ struct mp_ext_bus
char name[6];
};
#endif
#endif /* _STAGE2_PRIV_H */
+1 -2
View File
@@ -13,7 +13,6 @@
#define SYS_MAX_OS_NAME_LEN 32
#define SYS_THREAD_ARG_LENGTH_MAX 255
#define SYS_THREAD_STRING_LENGTH_MAX 2048
#endif
#endif /* _SYS_DEFINES_H */