DOS updates for new tree (Daniel Borca)

1 files changed, 129 insertions, 129 deletions

diff --git a/src/mesa/drivers/dos/internal.h b/src/mesa/drivers/dos/internal.h
index 6860ef35840..dfb9274ecc7 100644
--- a/src/mesa/drivers/dos/internal.h
+++ b/src/mesa/drivers/dos/internal.h
@@ -1,129 +1,129 @@
-/*

- * Mesa 3-D graphics library

- * Version:  4.0

- * 

- * Copyright (C) 1999  Brian Paul   All Rights Reserved.

- * 

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- * 

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- * 

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-/*

- * DOS/DJGPP device driver v1.3 for Mesa

- *

- *  Copyright (C) 2002 - Borca Daniel

- *  Email : [email protected]

- *  Web   : http://www.geocities.com/dborca

- */

-

-

-#ifndef INTERNAL_H_included

-#define INTERNAL_H_included

-

-#include "../mmath.h"

-

-/*

- * general purpose defines, etc.

- */

-#ifndef FALSE

-#define FALSE 0

-#define TRUE !FALSE

-#endif

-

-#define __PACKED__ __attribute__((packed))

-

-typedef unsigned char word8;

-typedef unsigned short word16;

-typedef unsigned long word32;

-

-#define _16_ *(word16 *)&

-#define _32_ *(word32 *)&

-

-

-

-/*

- * video mode structure

- */

-typedef struct vl_mode {

-        int mode;

-        int xres, yres;

-        int scanlen;

-        int bpp;

-

-        int sel;

-        int gran;

-} vl_mode;

-

-

-

-/*

- * video driver structure

- */

-typedef struct {

-        vl_mode *(*init) (void);

-        int (*entermode) (vl_mode *p, int refresh);

-        void (*blit) (void);

-        void (*setCI_f) (int index, float red, float green, float blue);

-        void (*setCI_i) (int index, int red, int green, int blue);

-        int (*get) (int pname, int *params);

-        void (*restore) (void);

-        void (*fini) (void);

-} vl_driver;

-

-

-

-/*

- * memory mapping

- */

-int _create_linear_mapping (unsigned long *linear, unsigned long physaddr, int size);

-void _remove_linear_mapping (unsigned long *linear);

-int _create_selector (int *segment, unsigned long base, int size);

-void _remove_selector (int *segment);

-

-/*

- * system routines

- */

-int _can_mmx (void);

-

-/*

- * asm routines to deal with virtual buffering

- */

-extern void v_clear8 (int color);

-#define v_clear15 v_clear16

-extern void v_clear16 (int color);

-extern void v_clear24 (int color);

-extern void v_clear32 (int color);

-

-extern void v_clear8_mmx (int color);

-#define v_clear15_mmx v_clear16_mmx

-extern void v_clear16_mmx (int color);

-extern void v_clear24_mmx (int color);

-extern void v_clear32_mmx (int color);

-

-extern void v_rect8 (int x, int y, int width, int height, int color);

-#define v_rect15 v_rect16

-extern void v_rect16 (int x, int y, int width, int height, int color);

-extern void v_rect24 (int x, int y, int width, int height, int color);

-extern void v_rect32 (int x, int y, int width, int height, int color);

-

-extern void v_putpixel8 (unsigned int offset, int color);

-#define v_putpixel15 v_putpixel16

-extern void v_putpixel16 (unsigned int offset, int color);

-extern void v_putpixel24 (unsigned int offset, int color);

-extern void v_putpixel32 (unsigned int offset, int color);

-

-#endif

+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ * 
+ * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * DOS/DJGPP device driver v1.4 for Mesa
+ *
+ *  Copyright (C) 2002 - Borca Daniel
+ *  Email : [email protected]
+ *  Web   : http://www.geocities.com/dborca
+ */
+
+
+#ifndef INTERNAL_H_included
+#define INTERNAL_H_included
+
+#include "../main/mtypes.h"
+
+/*
+ * general purpose defines, etc.
+ */
+#ifndef FALSE
+#define FALSE 0
+#define TRUE !FALSE
+#endif
+
+#define __PACKED__ __attribute__((packed))
+
+typedef unsigned char word8;
+typedef unsigned short word16;
+typedef unsigned long word32;
+
+#define _16_ *(word16 *)&
+#define _32_ *(word32 *)&
+
+
+
+/*
+ * video mode structure
+ */
+typedef struct vl_mode {
+        int mode;
+        int xres, yres;
+        int scanlen;
+        int bpp;
+
+        int sel;
+        int gran;
+} vl_mode;
+
+
+
+/*
+ * video driver structure
+ */
+typedef struct {
+        vl_mode *(*init) (void);
+        int (*entermode) (vl_mode *p, int refresh);
+        void (*blit) (void);
+        void (*setCI_f) (int index, float red, float green, float blue);
+        void (*setCI_i) (int index, int red, int green, int blue);
+        int (*get) (int pname, int *params);
+        void (*restore) (void);
+        void (*fini) (void);
+} vl_driver;
+
+
+
+/*
+ * memory mapping
+ */
+int _create_linear_mapping (unsigned long *linear, unsigned long physaddr, int size);
+void _remove_linear_mapping (unsigned long *linear);
+int _create_selector (int *segment, unsigned long base, int size);
+void _remove_selector (int *segment);
+
+/*
+ * system routines
+ */
+int _can_mmx (void);
+
+/*
+ * asm routines to deal with virtual buffering
+ */
+extern void v_clear8 (int color);
+#define v_clear15 v_clear16
+extern void v_clear16 (int color);
+extern void v_clear24 (int color);
+extern void v_clear32 (int color);
+
+extern void v_clear8_mmx (int color);
+#define v_clear15_mmx v_clear16_mmx
+extern void v_clear16_mmx (int color);
+extern void v_clear24_mmx (int color);
+extern void v_clear32_mmx (int color);
+
+extern void v_rect8 (int x, int y, int width, int height, int color);
+#define v_rect15 v_rect16
+extern void v_rect16 (int x, int y, int width, int height, int color);
+extern void v_rect24 (int x, int y, int width, int height, int color);
+extern void v_rect32 (int x, int y, int width, int height, int color);
+
+extern void v_putpixel8 (unsigned int offset, int color);
+#define v_putpixel15 v_putpixel16
+extern void v_putpixel16 (unsigned int offset, int color);
+extern void v_putpixel24 (unsigned int offset, int color);
+extern void v_putpixel32 (unsigned int offset, int color);
+
+#endif