Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 1887 → Rev 1888

/trunk/kernel/arch/amd64/include/context_offset.h
9,6 → 9,3
#define OFFSET_R15 0x38
#define OFFSET_IPL 0x40
 
/** @}
*/
 
/trunk/kernel/arch/amd64/include/interrupt.h
26,14 → 26,14
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64interrupt
/** @addtogroup amd64interrupt
* @{
*/
/** @file
*/
 
#ifndef __ia32_INTERRUPT_H__
#define __ia32_INTERRUPT_H__
#ifndef KERN_amd64_INTERRUPT_H_
#define KERN_amd64_INTERRUPT_H_
 
#include <arch/types.h>
#include <arch/pm.h>
128,6 → 128,5
 
#endif
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/include/byteorder.h
26,14 → 26,14
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64
/** @addtogroup amd64
* @{
*/
/** @file
*/
 
#ifndef __amd64_BYTEORDER_H__
#define __amd64_BYTEORDER_H__
#ifndef KERN_amd64_BYTEORDER_H_
#define KERN_amd64_BYTEORDER_H_
 
/* AMD64 is little-endian */
#define unative_t_le2host(n) (n)
41,6 → 41,5
 
#endif
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/include/cpuid.h
32,8 → 32,8
/** @file
*/
 
#ifndef __amd64_CPUID_H__
#define __amd64_CPUID_H__
#ifndef KERN_amd64_CPUID_H_
#define KERN_amd64_CPUID_H_
 
#define AMD_CPUID_EXTENDED 0x80000001
#define AMD_EXT_NOEXECUTE 20
60,7 → 60,7
 
extern uint64_t rdtsc(void);
 
#endif /* __ASM__ */
#endif /* !def __ASM__ */
#endif
 
/** @}
/trunk/kernel/arch/amd64/include/types.h
32,8 → 32,8
/** @file
*/
 
#ifndef __amd64_TYPES_H__
#define __amd64_TYPES_H__
#ifndef KERN_amd64_TYPES_H_
#define KERN_amd64_TYPES_H_
 
#define NULL 0
 
/trunk/kernel/arch/amd64/include/elf.h
26,14 → 26,14
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64
/** @addtogroup amd64
* @{
*/
/** @file
*/
 
#ifndef __amd64_ELF_H__
#define __amd64_ELF_H__
#ifndef KERN_amd64_ELF_H_
#define KERN_amd64_ELF_H_
 
#define ELF_MACHINE EM_X86_64
#define ELF_DATA_ENCODING ELFDATA2LSB
41,6 → 41,5
 
#endif
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/include/memstr.h
26,14 → 26,14
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64
/** @addtogroup amd64
* @{
*/
/** @file
*/
 
#ifndef __amd64_MEMSTR_H__
#define __amd64_MEMSTR_H__
#ifndef KERN_amd64_MEMSTR_H_
#define KERN_amd64_MEMSTR_H_
 
/** Copy memory
*
141,6 → 141,5
 
#endif
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/include/arg.h
26,19 → 26,19
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64
/** @addtogroup amd64
* @{
*/
/** @file
*/
 
#ifndef __amd64_ARG_H__
#define __amd64_ARG_H__
#ifndef KERN_amd64_ARG_H_
#define KERN_amd64_ARG_H_
 
#include <stdarg.h>
 
#endif
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/include/ddi/ddi.h
26,7 → 26,7
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64ddi
/** @addtogroup amd64ddi
* @{
*/
 
35,13 → 35,12
* @brief amd64 specific DDI declarations and macros.
*/
 
#ifndef __amd64_DDI_H__
#define __amd64_DDI_H__
#ifndef KERN_amd64_DDI_H_
#define KERN_amd64_DDI_H_
 
extern void io_perm_bitmap_install(void);
 
#endif
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/include/syscall.h
26,14 → 26,14
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64
/** @addtogroup amd64
* @{
*/
/** @file
*/
 
#ifndef __amd64_SYSCALL_H__
#define __amd64_SYSCALL_H__
#ifndef KERN_amd64_SYSCALL_H_
#define KERN_amd64_SYSCALL_H_
 
#include <arch/types.h>
 
41,6 → 41,5
 
#endif
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/include/atomic.h
26,14 → 26,14
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64
/** @addtogroup amd64
* @{
*/
/** @file
*/
 
#ifndef __amd64_ATOMIC_H__
#define __amd64_ATOMIC_H__
#ifndef KERN_amd64_ATOMIC_H_
#define KERN_amd64_ATOMIC_H_
 
#include <arch/types.h>
#include <arch/barrier.h>
125,6 → 125,5
 
#endif
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/include/pm.h
26,14 → 26,14
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64
/** @addtogroup amd64
* @{
*/
/** @file
*/
 
#ifndef __amd64_PM_H__
#define __amd64_PM_H__
#ifndef KERN_amd64_PM_H_
#define KERN_amd64_PM_H_
 
#ifndef __ASM__
# include <arch/types.h>
194,6 → 194,5
 
#endif
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/include/boot/boot.h
32,12 → 32,12
/** @file
*/
 
#ifndef __amd64_BOOT_H__
#define __amd64_BOOT_H__
#ifndef KERN_amd64_BOOT_H_
#define KERN_amd64_BOOT_H_
 
#define BOOT_OFFSET 0x108000
#define BOOT_OFFSET 0x108000
#define AP_BOOT_OFFSET 0x8000
#define BOOT_STACK_SIZE 0x400
#define BOOT_STACK_SIZE 0x400
 
#define MULTIBOOT_HEADER_MAGIC 0x1BADB002
#define MULTIBOOT_HEADER_FLAGS 0x00010003
/trunk/kernel/arch/amd64/include/asm.h
26,14 → 26,14
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64
/** @addtogroup amd64
* @{
*/
/** @file
*/
 
#ifndef __amd64_ASM_H__
#define __amd64_ASM_H__
#ifndef KERN_amd64_ASM_H_
#define KERN_amd64_ASM_H_
 
#include <arch/pm.h>
#include <arch/types.h>
274,12 → 274,10
GEN_WRITE_REG(dr6);
GEN_WRITE_REG(dr7);
 
 
extern size_t interrupt_handler_size;
extern void interrupt_handlers(void);
 
#endif
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/include/faddr.h
32,8 → 32,8
/** @file
*/
 
#ifndef __amd64_FADDR_H__
#define __amd64_FADDR_H__
#ifndef KERN_amd64_FADDR_H_
#define KERN_amd64_FADDR_H_
 
#include <arch/types.h>
 
/trunk/kernel/arch/amd64/include/mm/frame.h
26,14 → 26,14
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64mm
/** @addtogroup amd64mm
* @{
*/
/** @file
*/
 
#ifndef __amd64_FRAME_H__
#define __amd64_FRAME_H__
#ifndef KERN_amd64_FRAME_H_
#define KERN_amd64_FRAME_H_
 
#ifndef __ASM__
#include <arch/types.h>
42,7 → 42,6
#define FRAME_WIDTH 12 /* 4K */
#define FRAME_SIZE (1<<FRAME_WIDTH)
 
 
#ifndef __ASM__
extern uintptr_t last_frame;
extern void frame_arch_init(void);
50,6 → 49,5
 
#endif
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/include/mm/page.h
44,8 → 44,8
* ATTENTION - PA2KA(KA2PA(x)) != x if 'x' is in kernel
*/
 
#ifndef __amd64_PAGE_H__
#define __amd64_PAGE_H__
#ifndef KERN_amd64_PAGE_H_
#define KERN_amd64_PAGE_H_
 
#include <arch/mm/frame.h>
 
/trunk/kernel/arch/amd64/include/mm/ptl.h
26,16 → 26,15
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64mm
/** @addtogroup amd64mm
* @{
*/
/** @file
*/
 
#ifndef KERN_amd64_PTL_H_
#define KERN_amd64_PTL_H_
 
#ifndef __amd64_PTL_H_
#define __amd64_PTL_H_
 
#define PTL_NO_EXEC (1<<63)
#define PTL_ACCESSED (1<<5)
#define PTL_CACHE_DISABLE (1<<4)
48,6 → 47,5
 
#endif
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/include/mm/tlb.h
26,14 → 26,14
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64mm
/** @addtogroup amd64mm
* @{
*/
/** @file
*/
 
#ifndef __amd64_TLB_H__
#define __amd64_TLB_H__
#ifndef KERN_amd64_TLB_H_
#define KERN_amd64_TLB_H_
 
#define tlb_arch_init()
#define tlb_print()
40,6 → 40,5
 
#endif
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/include/mm/as.h
26,14 → 26,14
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64mm
/** @addtogroup amd64mm
* @{
*/
/** @file
*/
 
#ifndef __amd64_AS_H__
#define __amd64_AS_H__
#ifndef KERN_amd64_AS_H_
#define KERN_amd64_AS_H_
 
#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH 0
 
50,6 → 50,5
 
#endif
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/include/debugger.h
26,14 → 26,14
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64debug
/** @addtogroup amd64debug
* @{
*/
/** @file
*/
 
#ifndef __amd64_DEBUGGER_H__
#define __amd64_DEBUGGER_H__
#ifndef KERN_amd64_DEBUGGER_H_
#define KERN_amd64_DEBUGGER_H_
 
#include <arch/types.h>
 
53,6 → 53,5
 
#endif
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/include/context.h
26,16 → 26,16
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64
/** @addtogroup amd64
* @{
*/
/** @file
*/
 
#ifndef __amd64_CONTEXT_H__
#define __amd64_CONTEXT_H__
#ifndef KERN_amd64_CONTEXT_H_
#define KERN_amd64_CONTEXT_H_
 
#ifndef __amd64_TYPES_H__
#ifndef KERN_amd64_TYPES_H_
# include <arch/types.h>
#endif
 
66,6 → 66,5
 
#endif
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/include/cpu.h
32,8 → 32,8
/** @file
*/
 
#ifndef __amd64_CPU_H__
#define __amd64_CPU_H__
#ifndef KERN_amd64_CPU_H_
#define KERN_amd64_CPU_H_
 
#define RFLAGS_IF (1 << 9)
#define RFLAGS_RF (1 << 16)
/trunk/kernel/arch/amd64/include/drivers/vesa.h
26,22 → 26,19
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64
/** @addtogroup amd64
* @{
*/
/** @file
*/
 
#ifndef __VESA_H__
#define __VESA_H__
#ifndef KERN_amd64_VESA_H_
#define KERN_amd64_VESA_H_
 
 
int vesa_present(void);
void vesa_init(void);
 
 
#endif
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/src/syscall.c
26,7 → 26,7
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64
/** @addtogroup amd64
* @{
*/
/** @file
67,6 → 67,5
write_msr(AMD_MSR_SFMASK, 0x200);
}
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/src/pm.c
27,7 → 27,7
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64
/** @addtogroup amd64
* @{
*/
/** @file
240,6 → 240,5
tr_load(gdtselector(TSS_DES));
}
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/src/ddi/ddi.c
26,7 → 26,7
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64ddi
/** @addtogroup amd64ddi
* @{
*/
/** @file
162,6 → 162,5
CPU->arch.iomapver_copy = ver;
}
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/src/proc/scheduler.c
26,7 → 26,7
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64proc
/** @addtogroup amd64proc
* @{
*/
/** @file
80,6 → 80,5
{
}
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/src/proc/task.c
26,7 → 26,7
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64proc
/** @addtogroup amd64proc
* @{
*/
/** @file
56,6 → 56,5
free(t->arch.iomap.map);
}
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/src/debugger.c
26,7 → 26,7
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64debug
/** @addtogroup amd64debug
* @{
*/
/** @file
382,6 → 382,5
#endif
}
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/src/mm/memory_init.c
26,7 → 26,7
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64mm
/** @addtogroup amd64mm
* @{
*/
/** @file
75,7 → 75,5
 
}
 
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/src/mm/page.c
26,7 → 26,7
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64mm
/** @addtogroup amd64mm
* @{
*/
/** @file
215,6 → 215,5
return virtaddr;
}
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/src/userspace.c
26,7 → 26,7
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64
/** @addtogroup amd64
* @{
*/
/** @file
77,6 → 77,5
;
}
 
/** @}
/** @}
*/
 
/trunk/kernel/arch/amd64/src/interrupt.c
26,7 → 26,7
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup amd64interrupt
/** @addtogroup amd64interrupt
* @{
*/
/** @file
182,6 → 182,5
trap_virtual_enable_irqs(1 << irq);
}
 
/** @}
/** @}
*/