Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 292 → Rev 300

/SPARTAN/trunk/arch/ia32/include/pm.h
29,10 → 29,6
#ifndef __PM_H__
#define __PM_H__
 
#include <arch/types.h>
#include <typedefs.h>
#include <arch/context.h>
 
#define IDT_ITEMS 64
#define GDT_ITEMS 6
 
60,6 → 56,12
 
#define IO_MAP_BASE (104)
 
#ifndef __ASM__
 
#include <arch/types.h>
#include <typedefs.h>
#include <arch/context.h>
 
struct ptr_16_32 {
__u16 limit;
__u32 base;
145,4 → 147,6
 
extern void tss_initialize(struct tss *t);
 
#endif /* __ASM__ */
 
#endif
/SPARTAN/trunk/arch/ia32/include/mm/page.h
29,15 → 29,15
#ifndef __ia32_PAGE_H__
#define __ia32_PAGE_H__
 
#include <mm/page.h>
#include <arch/types.h>
#include <arch/mm/frame.h>
#include <typedefs.h>
 
#define PAGE_SIZE FRAME_SIZE
 
#define KA2PA(x) (((__address) (x)) - 0x80000000)
#define PA2KA(x) (((__address) (x)) + 0x80000000)
#ifndef __ASM__
# define KA2PA(x) (((__address) (x)) - 0x80000000)
# define PA2KA(x) (((__address) (x)) + 0x80000000)
#else
# define KA2PA(x) ((x) - 0x80000000)
# define PA2KA(x) ((x) + 0x80000000)
#endif
 
/*
* Implementation of generic 4-level page table interface.
70,6 → 70,13
#define SET_PTL3_FLAGS_ARCH(ptl2, i, x)
#define SET_FRAME_FLAGS_ARCH(ptl3, i, x) set_pt_flags((pte_t *)(ptl3), (index_t)(i), (x))
 
#ifndef __ASM__
 
#include <mm/page.h>
#include <arch/types.h>
#include <arch/mm/frame.h>
#include <typedefs.h>
 
struct page_specifier {
unsigned present : 1;
unsigned writeable : 1;
111,4 → 118,6
 
extern void page_arch_init(void);
 
#endif /* __ASM__ */
 
#endif