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

  → /trunk/kernel/genarch/ @ 1887

  → /trunk/kernel/genarch/ @ 1888

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 1887 → Rev 1888

/trunk/kernel/genarch/include/softint/division.h
26,16 → 26,15
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/** @addtogroup genarch
/** @addtogroup genarch
* @{
*/
/** @file
*/
#ifndef __SOFTINT_DIVISION_H__
#define __SOFTINT_DIVISION_H__
#ifndef KERN_DIVISION_H_
#define KERN_DIVISION_H_
/* 32bit integer division */
int __divsi3(int a, int b);
64,7 → 63,5
#endif
/** @}
/** @}
*/

/trunk/kernel/genarch/include/fb/font-8x16.h
26,14 → 26,14
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/** @addtogroup genarch
/** @addtogroup genarch
* @{
*/
/** @file
*/
#ifndef __FONT_8X16_H__
#define __FONT_8X16_H__
#ifndef KERN_FONT_8X16_H_
#define KERN_FONT_8X16_H_
#define FONT_GLIPHS 256
#define FONT_SCANLINES 16
42,6 → 42,5
#endif
/** @}
/** @}
*/

/trunk/kernel/genarch/include/fb/fb.h
26,14 → 26,14
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/** @addtogroup genarch
/** @addtogroup genarch
* @{
*/
/** @file
*/
#ifndef _FB_H_
#define _FB_H_
#ifndef KERN_FB_H_
#define KERN_FB_H_
#include <typedefs.h>
#include <arch/types.h>
43,6 → 43,5
#endif
/** @}
/** @}
*/

/trunk/kernel/genarch/include/mm/as_ht.h
32,8 → 32,8
/** @file
*/
#ifndef __AS_HT_H__
#define __AS_HT_H__
#ifndef KERN_AS_HT_H_
#define KERN_AS_HT_H_
#include <mm/as.h>

/trunk/kernel/genarch/include/mm/page_pt.h
40,8 → 40,8
#ifdef CONFIG_PAGE_PT
#ifndef __PAGE_PT_H__
#define __PAGE_PT_H__
#ifndef KERN_PAGE_PT_H_
#define KERN_PAGE_PT_H_
#include <arch/types.h>
#include <typedefs.h>

/trunk/kernel/genarch/include/mm/asid_fifo.h
26,19 → 26,18
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/** @addtogroup genarchmm
/** @addtogroup genarchmm
* @{
*/
/** @file
*/
#ifndef __ASID_FIFO_H__
#define __ASID_FIFO_H__
#ifndef KERN_ASID_FIFO_H_
#define KERN_ASID_FIFO_H_
extern void asid_fifo_init(void);
#endif
/** @}
/** @}
*/

/trunk/kernel/genarch/include/mm/as_pt.h
32,8 → 32,8
/** @file
*/
#ifndef __AS_PT_H__
#define __AS_PT_H__
#ifndef KERN_AS_PT_H_
#define KERN_AS_PT_H_
#include <mm/as.h>

/trunk/kernel/genarch/include/mm/page_ht.h
36,8 → 36,8
#ifdef CONFIG_PAGE_HT
#ifndef __PAGE_HT_H__
#define __PAGE_HT_H__
#ifndef KERN_PAGE_HT_H_
#define KERN_PAGE_HT_H_
#include <mm/page.h>
#include <typedefs.h>

/trunk/kernel/genarch/include/acpi/acpi.h
26,14 → 26,14
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/** @addtogroup genarch
/** @addtogroup genarch
* @{
*/
/** @file
*/
#ifndef __ACPI_H__
#define __ACPI_H__
#ifndef KERN_ACPI_H_
#define KERN_ACPI_H_
#include <arch/types.h>
88,8 → 88,7
extern void acpi_init(void);
extern int acpi_sdt_check(uint8_t *sdt);
#endif /* __ACPI_H__ */
#endif /* KERN_ACPI_H_ */
/** @}
/** @}
*/

/trunk/kernel/genarch/include/acpi/madt.h
26,14 → 26,14
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/** @addtogroup genarch
/** @addtogroup genarch
* @{
*/
/** @file
*/
#ifndef __MADT_H__
#define __MADT_H__
#ifndef KERN_MADT_H_
#define KERN_MADT_H_
#include <genarch/acpi/acpi.h>
#include <arch/smp/apic.h>
143,8 → 143,7
extern void acpi_madt_parse(void);
#endif /* __MADT_H__ */
#endif /* KERN_MADT_H_ */
/** @}
/** @}
*/

/trunk/kernel/genarch/src/kbd/ns16550.c
104,7 → 104,8
}
/** Wait until the controller reads its data. */
void ns16550_wait(void) {
void ns16550_wait(void)
{
}
/* Called from getc(). */

/trunk/kernel/genarch/src/softint/division.c
26,7 → 26,7
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/** @addtogroup genarch
/** @addtogroup genarch
* @{
*/
/** @file
191,8 → 191,5
return divandmod64(a, b, c);
}
/** @}
/** @}
*/

/trunk/kernel/genarch/src/fb/fb.c
304,30 → 304,30
spinlock_lock(&fb_lock);
switch (ch) {
case '\n':
invert_cursor();
position += columns;
position -= position % columns;
break;
case '\r':
invert_cursor();
position -= position % columns;
break;
case '\b':
invert_cursor();
if (position % columns)
position--;
break;
case '\t':
invert_cursor();
do {
draw_char(' ');
position++;
} while ((position % 8) && position < columns * rows);
break;
default:
draw_char(ch);
case '\n':
invert_cursor();
position += columns;
position -= position % columns;
break;
case '\r':
invert_cursor();
position -= position % columns;
break;
case '\b':
invert_cursor();
if (position % columns)
position--;
break;
case '\t':
invert_cursor();
do {
draw_char(' ');
position++;
} while ((position % 8) && position < columns * rows);
break;
default:
draw_char(ch);
position++;
}
if (position >= columns * rows) {
358,31 → 358,31
void fb_init(uintptr_t addr, unsigned int x, unsigned int y, unsigned int bpp, unsigned int scan, bool align)
{
switch (bpp) {
case 8:
rgb2scr = rgb_1byte;
scr2rgb = byte1_rgb;
pixelbytes = 1;
break;
case 16:
rgb2scr = rgb_2byte;
scr2rgb = byte2_rgb;
pixelbytes = 2;
break;
case 24:
rgb2scr = rgb_3byte;
scr2rgb = byte3_rgb;
if (align)
pixelbytes = 4;
else
pixelbytes = 3;
break;
case 32:
rgb2scr = rgb_4byte;
scr2rgb = byte4_rgb;
case 8:
rgb2scr = rgb_1byte;
scr2rgb = byte1_rgb;
pixelbytes = 1;
break;
case 16:
rgb2scr = rgb_2byte;
scr2rgb = byte2_rgb;
pixelbytes = 2;
break;
case 24:
rgb2scr = rgb_3byte;
scr2rgb = byte3_rgb;
if (align)
pixelbytes = 4;
break;
default:
panic("Unsupported bpp");
else
pixelbytes = 3;
break;
case 32:
rgb2scr = rgb_4byte;
scr2rgb = byte4_rgb;
pixelbytes = 4;
break;
default:
panic("Unsupported bpp");
}
unsigned int fbsize = scan * y;

/trunk/kernel/genarch/src/fb/font-8x16.c
26,7 → 26,7
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/** @addtogroup genarch
/** @addtogroup genarch
* @{
*/
/** @file
4646,6 → 4646,5
};
/** @}
/** @}
*/

/trunk/kernel/genarch/src/mm/as_pt.c
141,4 → 141,3
/** @}
*/

/trunk/kernel/genarch/src/acpi/madt.c
26,7 → 26,7
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/** @addtogroup genarch
/** @addtogroup genarch
* @{
*/
/**
243,6 → 243,5
#endif /* CONFIG_SMP */
/** @}
/** @}
*/

/trunk/kernel/genarch/src/acpi/acpi.c
26,8 → 26,7
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/** @addtogroup genarch
/** @addtogroup genarch
* @{
*/
183,7 → 182,5
}
/** @}
/** @}
*/