Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/iomd copy over some stuff from the shark versio...



details:   https://anonhg.NetBSD.org/src/rev/614ef4898976
branches:  trunk
changeset: 537773:614ef4898976
user:      chs <chs%NetBSD.org@localhost>
date:      Sat Oct 05 17:04:44 2002 +0000

description:
copy over some stuff from the shark version of this file.
(how did this compile before?)
add missing protos.

diffstat:

 sys/arch/arm/iomd/vidc.h |  60 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 59 insertions(+), 1 deletions(-)

diffs (84 lines):

diff -r 7c6cab20b3bf -r 614ef4898976 sys/arch/arm/iomd/vidc.h
--- a/sys/arch/arm/iomd/vidc.h  Sat Oct 05 17:04:28 2002 +0000
+++ b/sys/arch/arm/iomd/vidc.h  Sat Oct 05 17:04:44 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vidc.h,v 1.5 2002/10/01 21:16:15 reinoud Exp $ */
+/*     $NetBSD: vidc.h,v 1.6 2002/10/05 17:04:44 chs Exp $     */
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -181,6 +181,7 @@
 #ifdef _KERNEL
 extern int  vidc_write         __P((u_int /*reg*/, int /*value*/));
 extern void vidc_setstate      __P((struct vidc_state * /*vidc*/));
+extern void vidc_getstate      __P((struct vidc_state * /*vidc*/));
 extern void vidc_setpalette    __P((struct vidc_state * /*vidc*/));
 extern void vidc_stdpalette    __P((void));
 extern int  vidc_col           __P((int /*red*/, int /*green*/, int /*blue*/));
@@ -196,9 +197,66 @@
     int frame_rate;
 };
 
+typedef struct
+  {
+    int chars;                 /* Number of characters defined in font */
+    int width;                 /* Defined width of characters in bytes */
+    int height;                /* Defined height of characters in lines */
+    int pixel_width;           /* Width of characters in pixels */
+    int pixel_height;          /* Height of characters in pixels */
+    int x_spacing;             /* Spacing in pixels between chars */
+    int y_spacing;             /* Spacing in pixels between lines */
+    int data_size;             /* Allocated data size */
+    unsigned char *data;       /* Font data */
+  } font_struct;
+
+#define XRES mode.hder
+#define YRES mode.vder
+#define NUMCOLOURS (1 << mode.log2_bpp)
+
+struct vidc_info
+  {
+    struct vidc_mode mode;
+    struct vidc_state vidc;
+    font_struct *font;         /* pointer to current font_struct */
+    font_struct *normalfont;   /* pointer to normal font struct */
+    font_struct *italicfont;   /* pointer to italic font struct */
+    font_struct *boldfont;     /* pointer to bold font struct */
+    int xfontsize, yfontsize;
+    int text_width, text_height;
+    int bytes_per_line;
+    int bytes_per_scroll;
+    int pixelsperbyte;
+    int screensize;
+    int fast_render;
+    int forecolour, forefillcolour;
+    int backcolour, backfillcolour;
+    int text_colours;
+    int frontporch;
+    int topporch;      /* ;) */
+    int bold;
+    int reverse;
+    int n_forecolour;
+    int n_backcolour;
+    int blanked;
+    int scrollback_end;
+    int flash;
+    int cursor_flash;
+  };
 
 #endif /* !_LOCORE */
 
+#define COLOUR_BLACK_1 0x00
+#define COLOUR_WHITE_1 0x01
+
+#define COLOUR_BLACK_2 0x00
+#define COLOUR_WHITE_2 0x03
+
+#define COLOUR_BLACK_4 0x00
+#define COLOUR_WHITE_4 0x07
+
+#define COLOUR_BLACK_8 0x00
+#define COLOUR_WHITE_8 0x07
 
 #endif /* !_ARM32_VIDC_H */
 



Home | Main Index | Thread Index | Old Index