HelenOSHelenOS-docHelenOS-historic

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /branches/arm/kernel/arch/arm32/src/ @ 2213

  → /branches/arm/kernel/arch/arm32/src/ @ 2214

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 2213 → Rev 2214

/branches/arm/kernel/arch/arm32/src/console.c
34,11 → 34,11
#include <console/console.h>
#include <arch/console.h>
#include <arch/drivers/msim_gxemul.h>
#include <arch/drivers/gxemul.h>
void console_init(devno_t devno)
{
msim_gxemul_console(devno);
gxemul_console(devno);
}
/** Acquire console back for kernel
46,7 → 46,7
*/
void arch_grab_console(void)
{
msim_gxemul_kbd_grab();
gxemul_kbd_grab();
}
/** Return console to userspace
54,7 → 54,7
*/
void arch_release_console(void)
{
msim_gxemul_kbd_release();
gxemul_kbd_release();
}
/** @}

/branches/arm/kernel/arch/arm32/src/arm32.c
38,10 → 38,13
#include <config.h>
#include <arch/console.h>
#include <ddi/device.h>
#include "aux_print/printf.h"
#include <arch/interrupt.h>
#include <genarch/fb/fb.h>
#include <genarch/fb/visuals.h>
#include <print.h>
#include <config.h>
#include "aux_print/printf.h"
bootinfo_t bootinfo;
void arch_pre_main(void)
51,7 → 54,6
init.cnt = bootinfo.cnt;
printf("Used memmory\n");
for (i = 0; i < bootinfo.cnt; ++i) {
init.tasks[i].addr = bootinfo.tasks[i].addr;
init.tasks[i].size = bootinfo.tasks[i].size;
71,10 → 73,11
void arch_post_mm_init(void)
{
aux_printf("arch_post_mm_init\n");
// irq_init(8, 8); /// needs malloc ... so after mm init
// console_init(device_assign_devno()); // need hash table of irq ... so after irq_init
/* TODO */
interrupt_init();
console_init(device_assign_devno());
// fb_init(0x12000000, 640, 480, 1920, VISUAL_RGB_8_8_8);
}
void arch_post_cpu_init(void)

/branches/arm/kernel/arch/arm32/src/interrupt.c
1,5 → 1,5
/*
* Copyright (c) 2007 Petr Stepan
* Copyright (c) 2007 Petr Stepan, Michal Kebrt
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
32,10 → 32,14
/** @file
*/
#include<arch/asm.h>
#include<arch/regutils.h>
#include <arch/asm.h>
#include <arch/regutils.h>
#include <interrupt.h>
#define IRQ_COUNT 8
/** Disable interrupts.
*
* @return Old interrupt priority level.
81,5 → 85,9
return current_status_reg_read();
}
void interrupt_init(void) {
irq_init(IRQ_COUNT, IRQ_COUNT);
}
/** @}
*/

/branches/arm/kernel/arch/arm32/src/drivers/msim_gxemul.c
File deleted