Changeset e8194664 in mainline

Timestamp:

2006-05-05T15:09:40Z (19 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f58af46

Parents:

4c89b09

Message:

VESA FB cut unwanted

Location:

arch

Files:

• amd64/include/pm.h (modified) (2 diffs)
• amd64/src/pm.c (modified) (1 diff)
• ia32/include/pm.h (modified) (2 diffs)
• ia32/src/drivers/vesa.c (modified) (1 diff)
• ia32/src/pm.c (modified) (1 diff)

arch/amd64/include/pm.h

@@ -37 +37 @@
 
 #define IDT_ITEMS 64
-#define GDT_ITEMS 9
+#define GDT_ITEMS 8
 
-#define VESA_INIT_SEGMENT 0x8000
 
 #define NULL_DES        0
@@ -50 +49 @@
 /* EndOfWarning */
 #define TSS_DES         6
+
+
+
+#ifdef CONFIG_FB
+
 #define VESA_INIT_DES           8
+#define VESA_INIT_SEGMENT 0x8000
+#undef GDT_ITEMS 
+#define GDT_ITEMS 9
+
+#endif /*CONFIG_FB*/
+
+
 
 #define gdtselector(des)        ((des)<<3)

arch/amd64/src/pm.c

@@ -111 +111 @@
         { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
         /* VESA Init descriptor */
+#ifdef CONFIG_FB        
         { 0xffff, 0, VESA_INIT_SEGMENT>>12, AR_PRESENT | AR_CODE | DPL_KERNEL, 0xf, 0, 0, 0, 0, 0 }
+#endif
 };
 

arch/ia32/include/pm.h

@@ -31 +31 @@
 
 #define IDT_ITEMS 64
-#define GDT_ITEMS 8
+#define GDT_ITEMS 7
 
 #define VESA_INIT_SEGMENT 0x8000
@@ -42 +42 @@
 #define TSS_DES         5
 #define TLS_DES         6 /* Pointer to Thread-Local-Storage data */
+
+#ifdef CONFIG_FB
+
+#define VESA_INIT_SEGMENT 0x8000
 #define VESA_INIT_DES 7
+#undef GDT_ITEMS
+#define GDT_ITEMS 8
+
+#endif /* CONFIG_FB */
+
 
 #define selector(des)   ((des)<<3)

arch/ia32/src/drivers/vesa.c

@@ -78 +78 @@
         
         fb_init( videoram_lin_addr,vesa_width,vesa_height,vesa_bpp,vesa_scanline);
-        putchar('\n');
 }
 

arch/ia32/src/pm.c

@@ -69 +69 @@
         { 0xffff, 0, 0, AR_PRESENT | AR_DATA | AR_WRITABLE | DPL_USER, 0xf, 0, 0, 1, 1, 0 },
         /* VESA Init descriptor */
+#ifdef CONFIG_FB
         { 0xffff, 0, VESA_INIT_SEGMENT>>12, AR_PRESENT | AR_CODE | DPL_KERNEL, 0xf, 0, 0, 0, 0, 0 }
-        
+#endif  
 };