From 398c6b7980ac52ba15af78f45e71f49f33ded1aa Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 4 Feb 2003 02:43:27 +0000
Subject: DOS updates (Daniel Borca)

---
 src/mesa/drivers/dos/vesa/vesa.c | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

(limited to 'src/mesa/drivers/dos/vesa/vesa.c')

diff --git a/src/mesa/drivers/dos/vesa/vesa.c b/src/mesa/drivers/dos/vesa/vesa.c
index 26c474317f..1f3de844d7 100644
--- a/src/mesa/drivers/dos/vesa/vesa.c
+++ b/src/mesa/drivers/dos/vesa/vesa.c
@@ -32,6 +32,7 @@
 
 
 #include <dpmi.h>
+#include <pc.h>
 #include <stdlib.h>
 #include <stubinfo.h>
 #include <sys/exceptn.h>
@@ -454,22 +455,23 @@ static void vesa_restore (void)
  * In  : color index, R, G, B
  * Out : -
  *
- * Note: uses normalized values
+ * Note: uses integer values
  */
-static void vesa_setCI_f (int index, float red, float green, float blue)
+static void vesa_setCI_i (int index, int red, int green, int blue)
 {
- float max = (1 << vesa_color_precision) - 1;
-
- int _red = red * max;
- int _green = green * max;
- int _blue = blue * max;
-
+#if 0
  __asm("\n\
 		movw $0x1010, %%ax	\n\
 		movb %1, %%dh		\n\
 		movb %2, %%ch		\n\
 		int  $0x10		\n\
-"::"b"(index), "m"(_red), "m"(_green), "c"(_blue):"%eax", "%edx");
+ "::"b"(index), "m"(red), "m"(green), "c"(blue):"%eax", "%edx");
+#else
+ outportb(0x03C8, index);
+ outportb(0x03C9, red);
+ outportb(0x03C9, green);
+ outportb(0x03C9, blue);
+#endif
 }
 
 
@@ -479,16 +481,13 @@ static void vesa_setCI_f (int index, float red, float green, float blue)
  * In  : color index, R, G, B
  * Out : -
  *
- * Note: uses integer values
+ * Note: uses normalized values
  */
-static void vesa_setCI_i (int index, int red, int green, int blue)
+static void vesa_setCI_f (int index, float red, float green, float blue)
 {
- __asm("\n\
-		movw $0x1010, %%ax	\n\
-		movb %1, %%dh		\n\
-		movb %2, %%ch		\n\
-		int  $0x10		\n\
-"::"b"(index), "m"(red), "m"(green), "c"(blue):"%eax", "%edx");
+ float max = (1 << vesa_color_precision) - 1;
+
+ vesa_setCI_i(index, (int)(red * max), (int)(green * max), (int)(blue * max));
 }
 
 
-- 
cgit v1.2.3