1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
|
diff -NaurEbwB kdrive_alt/chips/Imakefile xc/programs/Xserver/hw/kdrive/chips/Imakefile
--- kdrive_alt/chips/Imakefile 2001-09-05 09:12:41.000000000 +0200
+++ xc/programs/Xserver/hw/kdrive/chips/Imakefile 2004-02-16 16:09:48.000000000 +0100
@@ -7,7 +7,7 @@
OBJS = chips.o chipsdraw.o chipsstub.o
-INCLUDES = -I. $(KDINCS) -I$(KDRIVE)/vesa
+INCLUDES = -I. $(KDINCS) -I$(KDRIVE)/fbdev
NormalLibraryObjectRule()
NormalLibraryTarget(chips,$(OBJS))
diff -NaurEbwB kdrive_alt/chips/chips.c xc/programs/Xserver/hw/kdrive/chips/chips.c
--- kdrive_alt/chips/chips.c 2001-09-05 09:12:41.000000000 +0200
+++ xc/programs/Xserver/hw/kdrive/chips/chips.c 2004-02-17 13:37:27.000000000 +0100
@@ -41,7 +41,7 @@
iopl (3);
- if (!vesaInitialize (card, &chipsc->vesa))
+ if (!fbdevInitialize (card, &chipsc->fb))
{
xfree (chipsc);
return FALSE;
@@ -70,24 +70,24 @@
if (!chipss)
return FALSE;
memset (chipss, '\0', sizeof (ChipsScreenInfo));
- if (!vesaScreenInitialize (screen, &chipss->vesa))
+ if (!fbdevScreenInitialize (screen, &chipss->fbdev))
{
xfree (chipss);
return FALSE;
}
- if (chipss->vesa.mapping != VESA_LINEAR)
- screen->dumb = TRUE;
+
+
if (!screen->dumb)
- {
- chipss->mmio_base = (CARD8 *) KdMapDevice (CHIPS_MMIO_BASE(chipss),
- CHIPS_MMIO_SIZE(chipss));
+ { /* map physical to virtual */
+ chipss->mmio_base = (CARD8 *) KdMapDevice (CHIPS_MMIO_BASE(chipsc),
+ CHIPS_MMIO_SIZE(chipsc));
if (chipss->mmio_base)
- {
- KdSetMappedMode (CHIPS_MMIO_BASE(chipss),
- CHIPS_MMIO_SIZE(chipss),
- KD_MAPPED_MODE_REGISTERS);
+ { /* try to use MTRR on x86 to speed up, does nothing on other platforms */
+ KdSetMappedMode (CHIPS_MMIO_BASE(chipsc),
+ CHIPS_MMIO_SIZE(chipsc),
+ KD_MAPPED_MODE_REGISTERS); /* means uncachable area */
}
else
screen->dumb = TRUE;
@@ -95,8 +95,8 @@
else
chipss->mmio_base = 0;
- chipss->screen = chipss->vesa.fb;
- memory = chipss->vesa.fb_size;
+ chipss->screen = chipsc->fb.fb;
+ memory = (2048 + 512) * 1024;
screen_size = screen->fb[0].byteStride * screen->height;
@@ -125,13 +125,13 @@
Bool
chipsInitScreen (ScreenPtr pScreen)
{
- return vesaInitScreen (pScreen);
+ return fbdevInitScreen (pScreen);
}
Bool
chipsFinishInitScreen (ScreenPtr pScreen)
{
- return vesaFinishInitScreen (pScreen);
+ return(TRUE);
}
CARD8
@@ -186,7 +186,7 @@
chipsPreserve (KdCardInfo *card)
{
ChipsCardInfo *chipss = card->driver;
- vesaPreserve(card);
+ fbdevPreserve(card);
}
void
@@ -205,7 +205,7 @@
KdScreenPriv(pScreen);
ChipsCardInfo *chipsc = pScreenPriv->card->driver;
- if (!vesaEnable (pScreen))
+ if (!fbdevEnable (pScreen))
return FALSE;
chipsSetMMIO (chipsc);
return TRUE;
@@ -229,7 +229,7 @@
void
chipsDisable (ScreenPtr pScreen)
{
- vesaDisable (pScreen);
+ fbdevDisable (pScreen);
}
void
@@ -238,22 +238,23 @@
ChipsCardInfo *chipsc = card->driver;
chipsResetMMIO (chipsc);
- vesaRestore (card);
+ fbdevRestore (card);
}
void
chipsScreenFini (KdScreenInfo *screen)
{
+ ChipsCardInfo *chipsc = screen->card->driver;
ChipsScreenInfo *chipss = (ChipsScreenInfo *) screen->driver;
if (chipss->mmio_base)
{
- KdUnmapDevice ((void *) chipss->mmio_base, CHIPS_MMIO_SIZE(chipss));
- KdResetMappedMode (CHIPS_MMIO_BASE(chipss),
- CHIPS_MMIO_SIZE(chipss),
+ KdUnmapDevice ((void *) chipss->mmio_base, CHIPS_MMIO_SIZE(chipsc));
+ KdResetMappedMode (CHIPS_MMIO_BASE(chipsc),
+ CHIPS_MMIO_SIZE(chipsc),
KD_MAPPED_MODE_REGISTERS);
}
- vesaScreenFini (screen);
+
xfree (chipss);
screen->driver = 0;
}
@@ -263,7 +264,7 @@
{
ChipsCardInfo *chipsc = card->driver;
- vesaCardFini (card);
+ fbdevCardFini (card);
}
#define chipsCursorInit (void *) 0
@@ -278,7 +279,7 @@
chipsInitScreen, /* initScreen */
chipsPreserve, /* preserve */
chipsEnable, /* enable */
- vesaDPMS, /* dpms */
+ chipsDPMS, /* dpms */
chipsDisable, /* disable */
chipsRestore, /* restore */
chipsScreenFini, /* scrfini */
@@ -296,7 +297,7 @@
chipsDrawDisable, /* disableAccel */
chipsDrawFini, /* finiAccel */
- vesaGetColors, /* getColors */
- vesaPutColors, /* putColors */
+ fbdevGetColors, /* getColors */
+ fbdevPutColors, /* putColors */
chipsFinishInitScreen /* finishInitScreen */
};
diff -NaurEbwB kdrive_alt/chips/chips.h xc/programs/Xserver/hw/kdrive/chips/chips.h
--- kdrive_alt/chips/chips.h 2001-09-05 09:12:41.000000000 +0200
+++ xc/programs/Xserver/hw/kdrive/chips/chips.h 2004-02-17 13:26:40.000000000 +0100
@@ -25,7 +25,7 @@
#ifndef _CHIPS_H_
#define _CHIPS_H_
-#include <vesa.h>
+#include <fbdev.h>
/*
* offset from ioport beginning
@@ -33,9 +33,9 @@
#define HIQV
#ifdef HIQV
-#define CHIPS_MMIO_BASE(c) ((c)->vesa.fb_phys + 0x400000)
+#define CHIPS_MMIO_BASE(c) ((c)->fb.fix.smem_start + 0x400000)
#else
-#define CHIPS_MMIO_BASE(c) ((c)->vesa.fb_phys + 0x200000)
+#define CHIPS_MMIO_BASE(c) ((c)->fb.fix.smem_start + 0x200000)
#endif
#define CHIPS_MMIO_SIZE(c) (0x20000)
@@ -48,7 +48,7 @@
} ChipsSave;
typedef struct _chipsCardInfo {
- VesaCardPrivRec vesa;
+ FbdevPriv fb;
CARD32 *window;
Bool mmio;
ChipsSave save;
@@ -69,7 +69,7 @@
#define CHIPS_CURSOR_HEIGHT 64
typedef struct _chipsScreenInfo {
- VesaScreenPrivRec vesa;
+ FbdevScrPriv fbdev;
CARD8 *mmio_base;
CARD8 *cursor_base;
CARD8 *screen;
diff -NaurEbwB kdrive_alt/chips/chipsstub.c xc/programs/Xserver/hw/kdrive/chips/chipsstub.c
--- kdrive_alt/chips/chipsstub.c 2001-10-12 08:33:08.000000000 +0200
+++ xc/programs/Xserver/hw/kdrive/chips/chipsstub.c 2004-02-17 13:23:57.000000000 +0100
@@ -53,7 +53,6 @@
{
int ret;
- if (!(ret = vesaProcessArgument (argc, argv, i)))
ret = KdProcessArgument(argc, argv, i);
return ret;
}
|
