Attachment #23896 for bug #37812

Lines 538-544 Link Here

(-)svgalib-1.9.17/include/vga.h (+2 lines)
538	#define ROP_COPY 0 /* Straight copy. */	538	#define ROP_COPY 0 /* Straight copy. */
539	#define ROP_OR 1 /* Source OR destination. */	539	#define ROP_OR 1 /* Source OR destination. */
540	#define ROP_AND 2 /* Source AND destination. */	540	#define ROP_AND 2 /* Source AND destination. */
		541	#ifndef ROP_XOR
541	#define ROP_XOR 3 /* Source XOR destination. */	542	#define ROP_XOR 3 /* Source XOR destination. */
		543	#endif
542	#define ROP_INVERT 4 /* Invert destination. */	544	#define ROP_INVERT 4 /* Invert destination. */
543		545
544	/* For the poly funcs */	546	/* For the poly funcs */

Lines 186-192 Link Here

(-)svgalib-1.9.17/src/drivers/ali.c (-1 / +1 lines)
186	static int ali_modeavailable(int mode)	186	static int ali_modeavailable(int mode)
187	{	187	{
188	const unsigned char *regs;	188	const unsigned char *regs;
189	struct info *info;	189	struct vgainfo *info;
190		190
191	regs = LOOKUPMODE(ali_modes, mode);	191	regs = LOOKUPMODE(ali_modes, mode);
192	if (regs == NULL \|\| mode == GPLANE16) {	192	if (regs == NULL \|\| mode == GPLANE16) {

Lines 193-199 Link Here

(-)svgalib-1.9.17/src/drivers/apm.c (-1 / +1 lines)
193		193
194	static int apm_modeavailable(int mode)	194	static int apm_modeavailable(int mode)
195	{	195	{
196	struct info *info;	196	struct vgainfo *info;
197	ModeTiming *modetiming;	197	ModeTiming *modetiming;
198	ModeInfo *modeinfo;	198	ModeInfo *modeinfo;
199		199

Lines 154-160 Link Here

(-)svgalib-1.9.17/src/drivers/ark.c (-1 / +1 lines)
154		154
155	static int ark_modeavailable(int mode)	155	static int ark_modeavailable(int mode)
156	{	156	{
157	struct info *info;	157	struct vgainfo *info;
158	ModeInfo *modeinfo;	158	ModeInfo *modeinfo;
159	ModeTiming *modetiming;	159	ModeTiming *modetiming;
160		160

Lines 134-140 Link Here

(-)svgalib-1.9.17/src/drivers/banshee.c (-1 / +1 lines)
134		134
135	static int banshee_modeavailable(int mode)	135	static int banshee_modeavailable(int mode)
136	{	136	{
137	struct info *info;	137	struct vgainfo *info;
138	ModeTiming *modetiming;	138	ModeTiming *modetiming;
139	ModeInfo *modeinfo;	139	ModeInfo *modeinfo;
140		140

Lines 1035-1041 Link Here

(-)svgalib-1.9.17/src/drivers/chips.c (-1 / +1 lines)
1035	/----------------------------------------------------------------------/	1035	/----------------------------------------------------------------------/
1036	static int CHIPS_modeavailable(int mode)	1036	static int CHIPS_modeavailable(int mode)
1037	{	1037	{
1038	struct info *info;	1038	struct vgainfo *info;
1039	ModeTiming *modetiming;	1039	ModeTiming *modetiming;
1040	ModeInfo *modeinfo;	1040	ModeInfo *modeinfo;
1041		1041

Lines 387-393 Link Here

(-)svgalib-1.9.17/src/drivers/cirrus.c (-1 / +1 lines)
387		387
388	static int cirrus_modeavailable(int mode)	388	static int cirrus_modeavailable(int mode)
389	{	389	{
390	struct info *info;	390	struct vgainfo *info;
391	ModeTiming *modetiming;	391	ModeTiming *modetiming;
392	ModeInfo *modeinfo;	392	ModeInfo *modeinfo;
393		393

Lines 151-157 Link Here

(-)svgalib-1.9.17/src/drivers/et3000.c (-1 / +1 lines)
151	static int et3000_modeavailable(int mode)	151	static int et3000_modeavailable(int mode)
152	{	152	{
153	const unsigned char *regs;	153	const unsigned char *regs;
154	struct info *info;	154	struct vgainfo *info;
155		155
156	regs = LOOKUPMODE(et3000_modes, mode);	156	regs = LOOKUPMODE(et3000_modes, mode);
157	if (regs == NULL \|\| mode == GPLANE16)	157	if (regs == NULL \|\| mode == GPLANE16)

Lines 561-567 Link Here

(-)svgalib-1.9.17/src/drivers/et4000.c (-1 / +1 lines)
561	static int et4000_modeavailable(int mode)	561	static int et4000_modeavailable(int mode)
562	{	562	{
563	const unsigned char *regs;	563	const unsigned char *regs;
564	struct info *info;	564	struct vgainfo *info;
565		565
566	regs = LOOKUPMODE(et4000_modes, mode);	566	regs = LOOKUPMODE(et4000_modes, mode);
567	if (regs == NULL \|\| mode == GPLANE16)	567	if (regs == NULL \|\| mode == GPLANE16)

Lines 708-714 Link Here

(-)svgalib-1.9.17/src/drivers/et6000.c (-1 / +1 lines)
708	static int et6000_modeavailable(int mode)	708	static int et6000_modeavailable(int mode)
709	{	709	{
710	int rtn;	710	int rtn;
711	struct info *info;	711	struct vgainfo *info;
712	ModeTiming *modetiming;	712	ModeTiming *modetiming;
713	ModeInfo *modeinfo;	713	ModeInfo *modeinfo;
714		714

Lines 198-204 Link Here

(-)svgalib-1.9.17/src/drivers/g400.c (-1 / +1 lines)
198		198
199	static int g400_modeavailable(int mode)	199	static int g400_modeavailable(int mode)
200	{	200	{
201	struct info *info;	201	struct vgainfo *info;
202	ModeTiming *modetiming;	202	ModeTiming *modetiming;
203	ModeInfo *modeinfo;	203	ModeInfo *modeinfo;
204		204

Lines 153-159 Link Here

(-)svgalib-1.9.17/src/drivers/g450c2.c (-1 / +1 lines)
153		153
154	static int modeavailable(int mode)	154	static int modeavailable(int mode)
155	{	155	{
156	struct info *info;	156	struct vgainfo *info;
157	ModeTiming *modetiming;	157	ModeTiming *modetiming;
158	ModeInfo *modeinfo;	158	ModeInfo *modeinfo;
159		159

Lines 284-290 Link Here

(-)svgalib-1.9.17/src/drivers/i740.c (-1 / +1 lines)
284		284
285	static int i740_modeavailable(int mode)	285	static int i740_modeavailable(int mode)
286	{	286	{
287	struct info *info;	287	struct vgainfo *info;
288	ModeTiming *modetiming;	288	ModeTiming *modetiming;
289	ModeInfo *modeinfo;	289	ModeInfo *modeinfo;
290		290

Lines 270-276 Link Here

(-)svgalib-1.9.17/src/drivers/i810.c (-1 / +1 lines)
270		270
271	static int modeavailable(int mode)	271	static int modeavailable(int mode)
272	{	272	{
273	struct info *info;	273	struct vgainfo *info;
274	ModeTiming *modetiming;	274	ModeTiming *modetiming;
275	ModeInfo *modeinfo;	275	ModeInfo *modeinfo;
276		276

Lines 184-190 Link Here

(-)svgalib-1.9.17/src/drivers/laguna.c (-1 / +1 lines)
184		184
185	static int laguna_modeavailable(int mode)	185	static int laguna_modeavailable(int mode)
186	{	186	{
187	struct info *info;	187	struct vgainfo *info;
188	ModeTiming *modetiming;	188	ModeTiming *modetiming;
189	ModeInfo *modeinfo;	189	ModeInfo *modeinfo;
190		190




    return 0;
}

static inline int col2msk(struct vgainfo *iptr)
{
    switch (iptr->colors) {
    case 1 << 24:

    return 0;
}

static inline int col2bypp(struct vgainfo *iptr)
{
    return iptr->bytesperpixel;
}

static int mach32_log2(struct vgainfo *iptr)
{
    int res = -1, n = iptr->colors;


static void mach32_modfill(const mode_entry * mode, int modemask, int forcein)
{
    register int i;
    register struct vgainfo *iptr;
    register unsigned wid, hei;

    float horz, vert, n_horz, n_vert, cmpvert;

}

static char *
 colstr(struct vgainfo *mode)
{
    static char str[4];
    if (mode->colors <= 256) {

Lines 628-634 Link Here

(-)svgalib-1.9.17/src/drivers/millennium.c (-1 / +1 lines)
628		628
629	static int mil_modeavailable(int mode)	629	static int mil_modeavailable(int mode)
630	{	630	{
631	struct info *info;	631	struct vgainfo *info;
632	ModeTiming *modetiming;	632	ModeTiming *modetiming;
633	ModeInfo *modeinfo;	633	ModeInfo *modeinfo;
634		634

Lines 181-187 Link Here

(-)svgalib-1.9.17/src/drivers/mx.c (-1 / +1 lines)
181		181
182	static int mx_modeavailable(int mode)	182	static int mx_modeavailable(int mode)
183	{	183	{
184	struct info *info;	184	struct vgainfo *info;
185	ModeTiming *modetiming;	185	ModeTiming *modetiming;
186	ModeInfo *modeinfo;	186	ModeInfo *modeinfo;
187		187

Lines 442-448 Link Here

(-)svgalib-1.9.17/src/drivers/neo.c (-1 / +1 lines)
442		442
443	static int neo_modeavailable(int mode)	443	static int neo_modeavailable(int mode)
444	{	444	{
445	struct info *info;	445	struct vgainfo *info;
446	ModeTiming *modetiming;	446	ModeTiming *modetiming;
447	ModeInfo *modeinfo;	447	ModeInfo *modeinfo;
448		448

Lines 152-158 Link Here

(-)svgalib-1.9.17/src/drivers/nv3.c (-1 / +1 lines)
152		152
153	static int nv3_modeavailable(int mode)	153	static int nv3_modeavailable(int mode)
154	{	154	{
155	struct info *info;	155	struct vgainfo *info;
156	ModeTiming *modetiming;	156	ModeTiming *modetiming;
157	ModeInfo *modeinfo;	157	ModeInfo *modeinfo;
158		158

Lines 275-281 Link Here

(-)svgalib-1.9.17/src/drivers/oak.c (-1 / +1 lines)
275	static int oak_modeavailable(int mode)	275	static int oak_modeavailable(int mode)
276	{	276	{
277	const unsigned char *regs;	277	const unsigned char *regs;
278	struct info *info;	278	struct vgainfo *info;
279		279
280	regs = LOOKUPMODE(oak_modes, mode);	280	regs = LOOKUPMODE(oak_modes, mode);
281	if (regs == NULL \|\| mode == GPLANE16) {	281	if (regs == NULL \|\| mode == GPLANE16) {

Lines 224-230 Link Here

(-)svgalib-1.9.17/src/drivers/paradise.c (-1 / +1 lines)
224	static int paradise_modeavailable(int mode)	224	static int paradise_modeavailable(int mode)
225	{	225	{
226	const unsigned char *regs;	226	const unsigned char *regs;
227	struct info *info;	227	struct vgainfo *info;
228	#ifdef DEBUG	228	#ifdef DEBUG
229	fprintf(stderr,"paradise_modeavailable\n");	229	fprintf(stderr,"paradise_modeavailable\n");
230	#endif	230	#endif

Lines 214-220 Link Here

(-)svgalib-1.9.17/src/drivers/pm2.c (-1 / +1 lines)
214		214
215	static int modeavailable(int mode)	215	static int modeavailable(int mode)
216	{	216	{
217	struct info *info;	217	struct vgainfo *info;
218	ModeTiming *modetiming;	218	ModeTiming *modetiming;
219	ModeInfo *modeinfo;	219	ModeInfo *modeinfo;
220		220

Lines 1024-1030 Link Here

(-)svgalib-1.9.17/src/drivers/r128.c (-1 / +1 lines)
1024		1024
1025	static int r128_modeavailable(int mode)	1025	static int r128_modeavailable(int mode)
1026	{	1026	{
1027	struct info *info;	1027	struct vgainfo *info;
1028	ModeTiming *modetiming;	1028	ModeTiming *modetiming;
1029	ModeInfo *modeinfo;	1029	ModeInfo *modeinfo;
1030		1030

Lines 611-617 Link Here

(-)svgalib-1.9.17/src/drivers/rage.c (-1 / +1 lines)
611		611
612	static int rage_modeavailable(int mode)	612	static int rage_modeavailable(int mode)
613	{	613	{
614	struct info *info;	614	struct vgainfo *info;
615	ModeTiming *modetiming;	615	ModeTiming *modetiming;
616	ModeInfo *modeinfo;	616	ModeInfo *modeinfo;
617		617

Lines 142-148 Link Here

(-)svgalib-1.9.17/src/drivers/rendition.c (-1 / +1 lines)
142		142
143	static int modeavailable(int mode)	143	static int modeavailable(int mode)
144	{	144	{
145	struct info *info;	145	struct vgainfo *info;
146	ModeTiming *modetiming;	146	ModeTiming *modetiming;
147	ModeInfo *modeinfo;	147	ModeInfo *modeinfo;
148		148

Lines 484-490 Link Here

(-)svgalib-1.9.17/src/drivers/s3.c (-1 / +1 lines)
484		484
485	static int s3_modeavailable(int mode)	485	static int s3_modeavailable(int mode)
486	{	486	{
487	struct info *info;	487	struct vgainfo *info;
488	ModeInfo *modeinfo;	488	ModeInfo *modeinfo;
489	ModeTiming *modetiming;	489	ModeTiming *modetiming;
490		490

Lines 415-421 Link Here

(-)svgalib-1.9.17/src/drivers/savage.c (-1 / +1 lines)
415		415
416	static int modeavailable(int mode)	416	static int modeavailable(int mode)
417	{	417	{
418	struct info *info;	418	struct vgainfo *info;
419	ModeTiming *modetiming;	419	ModeTiming *modetiming;
420	ModeInfo *modeinfo;	420	ModeInfo *modeinfo;
421		421

Lines 212-218 Link Here

(-)svgalib-1.9.17/src/drivers/sis.c (-1 / +1 lines)
212		212
213	static int sis_modeavailable(int mode)	213	static int sis_modeavailable(int mode)
214	{	214	{
215	struct info *info;	215	struct vgainfo *info;
216	ModeTiming *modetiming;	216	ModeTiming *modetiming;
217	ModeInfo *modeinfo;	217	ModeInfo *modeinfo;
218		218

Lines 80-86 Link Here

(-)svgalib-1.9.17/src/drivers/skeleton.h (-1 / +1 lines)
80		80
81	static int modeavailable(int mode)	81	static int modeavailable(int mode)
82	{	82	{
83	struct info *info;	83	struct vgainfo *info;
84	ModeTiming *modetiming;	84	ModeTiming *modetiming;
85	ModeInfo *modeinfo;	85	ModeInfo *modeinfo;
86		86

Lines 290-296 Link Here

(-)svgalib-1.9.17/src/drivers/trident.c (-1 / +1 lines)
290		290
291	static int modeavailable(int mode)	291	static int modeavailable(int mode)
292	{	292	{
293	struct info *info;	293	struct vgainfo *info;
294	ModeTiming *modetiming;	294	ModeTiming *modetiming;
295	ModeInfo *modeinfo;	295	ModeInfo *modeinfo;
296		296

Lines 498-504 Link Here

(-)svgalib-1.9.17/src/drivers/tvga8900.c (-1 / +1 lines)
498	static int tvga8900_modeavailable(int mode)	498	static int tvga8900_modeavailable(int mode)
499	{	499	{
500	const unsigned char *regs;	500	const unsigned char *regs;
501	struct info *info;	501	struct vgainfo *info;
502		502
503	regs = LOOKUPMODE(tvga_modes, mode);	503	regs = LOOKUPMODE(tvga_modes, mode);
504	if (regs == NULL \|\| mode == GPLANE16)	504	if (regs == NULL \|\| mode == GPLANE16)

Lines 139-145 Link Here

(-)svgalib-1.9.17/src/drivers/vesa.c (-1 / +1 lines)
139		139
140	static int vesa_modeavailable(int mode)	140	static int vesa_modeavailable(int mode)
141	{	141	{
142	struct info *info;	142	struct vgainfo *info;
143	ModeTiming *modetiming;	143	ModeTiming *modetiming;
144	ModeInfo *modeinfo;	144	ModeInfo *modeinfo;
145		145




#define GPLANE16   G640x350x16

/* graphics mode information */

//fixing kernel 2.6 header compile problem
//what the fuck is wrong with this shit
// can't beliveve this
struct vgainfo {
    int xdim;
    int ydim;
    int colors;

extern unsigned long __svgalib_mmio_base, __svgalib_mmio_size;
extern unsigned long __svgalib_linear_mem_base, __svgalib_linear_mem_size;
extern unsigned long __svgalib_mmio_base, __svgalib_mmio_size;
extern struct vgainfo CI;		/* current video parameters */
extern int COL;			/* current color            */
extern int CM;			/* current video mode       */
extern struct vgainfo infotable[];
extern int SCREENON;		/* screen visible if != 0 */
extern unsigned long __svgalib_graph_base;
extern unsigned char *GM;	/* graphics memory frame */




/* If == 0 then nothing is defined by the user... */
int __svgalib_default_mode = 10;

struct vgainfo infotable[] =
{
    {80, 25, 16, 160, 0},	/* VGAlib VGA modes */
    {320, 200, 16, 40, 0},

    {0, 0, 0, 0, 0}
};

#define MAX_MODES (sizeof(infotable) / sizeof(struct vgainfo))

void (*__svgalib_go_to_background) (void) = 0;
void (*__svgalib_come_from_background) (void) = 0;

static int flip_mode = TEXT;	/* flipped video mode       */

int CM = TEXT;			/* current video mode       */
struct vgainfo CI;			/* current video parameters */
int COL;			/* current color            */

static int initialized = 0;	/* flag: initialize() called ?  */

Lines 538-544 Link Here

(-)svgalib-1.9.17/src/vga.h (+2 lines)
538	#define ROP_COPY 0 /* Straight copy. */	538	#define ROP_COPY 0 /* Straight copy. */
539	#define ROP_OR 1 /* Source OR destination. */	539	#define ROP_OR 1 /* Source OR destination. */
540	#define ROP_AND 2 /* Source AND destination. */	540	#define ROP_AND 2 /* Source AND destination. */
		541	#ifndef ROP_XOR
541	#define ROP_XOR 3 /* Source XOR destination. */	542	#define ROP_XOR 3 /* Source XOR destination. */
		543	#endif
542	#define ROP_INVERT 4 /* Invert destination. */	544	#define ROP_INVERT 4 /* Invert destination. */
543		545
544	/* For the poly funcs */	546	/* For the poly funcs */

Lines 62-68 Link Here

(-)svgalib-1.9.17/svpmi/svpmi.c (-1 / +1 lines)
62	static int	62	static int
63	svpmi_modeavailable (int mode)	63	svpmi_modeavailable (int mode)
64	{	64	{
65	struct info *info;	65	struct vgainfo *info;
66	svpmi_modeentry *sm;	66	svpmi_modeentry *sm;
67		67
68	if (mode < 10)	68	if (mode < 10)

Return to bug 37812

Lines 1837-1843 Link Here

(-)svgalib-1.9.17/src/drivers/mach32.c (-5 / +5 lines)
1837	return 0;	1837	return 0;
1838	}	1838	}
1839		1839
1840	static inline int col2msk(struct info *iptr)	1840	static inline int col2msk(struct vgainfo *iptr)
1841	{	1841	{
1842	switch (iptr->colors) {	1842	switch (iptr->colors) {
1843	case 1 << 24:	1843	case 1 << 24:
Lines 1864-1875 Link Here
1864	return 0;	1864	return 0;
1865	}	1865	}
1866		1866
1867	static inline int col2bypp(struct info *iptr)	1867	static inline int col2bypp(struct vgainfo *iptr)
1868	{	1868	{
1869	return iptr->bytesperpixel;	1869	return iptr->bytesperpixel;
1870	}	1870	}
1871		1871
1872	static int mach32_log2(struct info *iptr)	1872	static int mach32_log2(struct vgainfo *iptr)
1873	{	1873	{
1874	int res = -1, n = iptr->colors;	1874	int res = -1, n = iptr->colors;
1875		1875
Lines 1885-1891 Link Here
1885	static void mach32_modfill(const mode_entry * mode, int modemask, int forcein)	1885	static void mach32_modfill(const mode_entry * mode, int modemask, int forcein)
1886	{	1886	{
1887	register int i;	1887	register int i;
1888	register struct info *iptr;	1888	register struct vgainfo *iptr;
1889	register unsigned wid, hei;	1889	register unsigned wid, hei;
1890		1890
1891	float horz, vert, n_horz, n_vert, cmpvert;	1891	float horz, vert, n_horz, n_vert, cmpvert;
Lines 3061-3067 Link Here
3061	}	3061	}
3062		3062
3063	static char *	3063	static char *
3064	colstr(struct info *mode)	3064	colstr(struct vgainfo *mode)
3065	{	3065	{
3066	static char str[4];	3066	static char str[4];
3067	if (mode->colors <= 256) {	3067	if (mode->colors <= 256) {

Lines 103-109 Link Here

(-)svgalib-1.9.17/src/libvga.h (-3 / +7 lines)
103	#define GPLANE16 G640x350x16	103	#define GPLANE16 G640x350x16
104		104
105	/* graphics mode information */	105	/* graphics mode information */
106	struct info {	106
		107	//fixing kernel 2.6 header compile problem
		108	//what the fuck is wrong with this shit
		109	// can't beliveve this
		110	struct vgainfo {
107	int xdim;	111	int xdim;
108	int ydim;	112	int ydim;
109	int colors;	113	int colors;
Lines 127-136 Link Here
127	extern unsigned long __svgalib_mmio_base, __svgalib_mmio_size;	131	extern unsigned long __svgalib_mmio_base, __svgalib_mmio_size;
128	extern unsigned long __svgalib_linear_mem_base, __svgalib_linear_mem_size;	132	extern unsigned long __svgalib_linear_mem_base, __svgalib_linear_mem_size;
129	extern unsigned long __svgalib_mmio_base, __svgalib_mmio_size;	133	extern unsigned long __svgalib_mmio_base, __svgalib_mmio_size;
130	extern struct info CI; /* current video parameters */	134	extern struct vgainfo CI; /* current video parameters */
131	extern int COL; /* current color */	135	extern int COL; /* current color */
132	extern int CM; /* current video mode */	136	extern int CM; /* current video mode */
133	extern struct info infotable[];	137	extern struct vgainfo infotable[];
134	extern int SCREENON; /* screen visible if != 0 */	138	extern int SCREENON; /* screen visible if != 0 */
135	extern unsigned long __svgalib_graph_base;	139	extern unsigned long __svgalib_graph_base;
136	extern unsigned char GM; / graphics memory frame */	140	extern unsigned char GM; / graphics memory frame */

Lines 87-93 Link Here

(-)svgalib-1.9.17/src/vga.c (-3 / +3 lines)
87	/* If == 0 then nothing is defined by the user... */	87	/* If == 0 then nothing is defined by the user... */
88	int __svgalib_default_mode = 10;	88	int __svgalib_default_mode = 10;
89		89
90	struct info infotable[] =	90	struct vgainfo infotable[] =
91	{	91	{
92	{80, 25, 16, 160, 0}, /* VGAlib VGA modes */	92	{80, 25, 16, 160, 0}, /* VGAlib VGA modes */
93	{320, 200, 16, 40, 0},	93	{320, 200, 16, 40, 0},
Lines 280-286 Link Here
280	{0, 0, 0, 0, 0}	280	{0, 0, 0, 0, 0}
281	};	281	};
282		282
283	#define MAX_MODES (sizeof(infotable) / sizeof(struct info))	283	#define MAX_MODES (sizeof(infotable) / sizeof(struct vgainfo))
284		284
285	void (*__svgalib_go_to_background) (void) = 0;	285	void (*__svgalib_go_to_background) (void) = 0;
286	void (*__svgalib_come_from_background) (void) = 0;	286	void (*__svgalib_come_from_background) (void) = 0;
Lines 372-378 Link Here
372	static int flip_mode = TEXT; /* flipped video mode */	372	static int flip_mode = TEXT; /* flipped video mode */
373		373
374	int CM = TEXT; /* current video mode */	374	int CM = TEXT; /* current video mode */
375	struct info CI; /* current video parameters */	375	struct vgainfo CI; /* current video parameters */
376	int COL; /* current color */	376	int COL; /* current color */
377		377
378	static int initialized = 0; /* flag: initialize() called ? */	378	static int initialized = 0; /* flag: initialize() called ? */