1 diff -Nur fbset-2.1.orig/fb.h fbset-2.1/fb.h
2 --- fbset-2.1.orig/fb.h Wed Jun 23 16:09:48 1999
3 +++ fbset-2.1/fb.h Mon May 15 07:07:38 2000
5 #define FB_ACCEL_MATROX_MGAG100 20 /* Matrox G100 (Productiva G100) */
6 #define FB_ACCEL_MATROX_MGAG200 21 /* Matrox G200 (Myst, Mill, ...) */
7 #define FB_ACCEL_SUN_CG14 22 /* Sun cgfourteen */
8 -#define FB_ACCEL_SUN_BWTWO 23 /* Sun bwtwo */
9 -#define FB_ACCEL_SUN_CGTHREE 24 /* Sun cgthree */
10 -#define FB_ACCEL_SUN_TCX 25 /* Sun tcx */
11 -#define FB_ACCEL_MATROX_MGAG400 26 /* Matrox G400 */
12 +#define FB_ACCEL_SUN_BWTWO 23 /* Sun bwtwo */
13 +#define FB_ACCEL_SUN_CGTHREE 24 /* Sun cgthree */
14 +#define FB_ACCEL_SUN_TCX 25 /* Sun tcx */
15 +#define FB_ACCEL_MATROX_MGAG400 26 /* Matrox G400 */
16 +#define FB_ACCEL_NV3 27 /* nVidia RIVA 128 */
17 +#define FB_ACCEL_NV4 28 /* nVidia RIVA TNT */
18 +#define FB_ACCEL_NV5 29 /* nVidia RIVA TNT2 */
19 +#define FB_ACCEL_CT_6555x 30 /* C&T 6555x */
20 +#define FB_ACCEL_3DFX_BANSHEE 31 /* 3Dfx Banshee */
21 +#define FB_ACCEL_ATI_RAGE128 32 /* ATI Rage128 family */
23 struct fb_fix_screeninfo {
24 char id[16]; /* identification string eg "TT Builtin" */
25 diff -Nur fbset-2.1.orig/fbset.c fbset-2.1/fbset.c
26 --- fbset-2.1.orig/fbset.c Wed Jun 23 16:11:46 1999
27 +++ fbset-2.1/fbset.c Mon May 15 07:07:38 2000
29 * Default Frame Buffer Special Device Node
32 -#define DEFAULT_FRAMEBUFFER "/dev/fb0"
33 +#define DEFAULT_FRAMEBUFFER "/dev/fb0"
34 +#define DEFAULT_FRAMEBUFFER_DEVFS "/dev/fb/0"
39 { FB_ACCEL_SUN_CGTHREE, "Sun cg3" },
40 { FB_ACCEL_SUN_TCX, "Sun tcx" },
41 { FB_ACCEL_MATROX_MGAG400, "Matrox G400" },
42 + { FB_ACCEL_NV3, "nVidia RIVA 128" },
43 + { FB_ACCEL_NV4, "nVidia RIVA TNT" },
44 + { FB_ACCEL_NV5, "nVidia RIVA TNT2" },
45 + { FB_ACCEL_CT_6555x, "C&T 6555x" },
46 + { FB_ACCEL_3DFX_BANSHEE, "3Dfx Banshee" },
47 + { FB_ACCEL_ATI_RAGE128, "ATI Rage128 family" },
55 -int OpenFrameBuffer(const char *name);
56 +int OpenFrameBuffer(const char *name, int dodie);
57 void CloseFrameBuffer(int fh);
58 void GetVarScreenInfo(int fh, struct fb_var_screeninfo *var);
59 void SetVarScreenInfo(int fh, struct fb_var_screeninfo *var);
61 * Open the Frame Buffer Device
64 -int OpenFrameBuffer(const char *name)
65 +int OpenFrameBuffer(const char *name, int dodie)
70 printf("Opening frame buffer device `%s'\n", name);
72 if ((fh = open(name, O_RDONLY)) == -1)
73 - Die("open %s: %s\n", name, strerror(errno));
75 + Die("open %s: %s\n", name, strerror(errno));
80 if (Opt_version || Opt_verbose)
84 - Opt_fb = DEFAULT_FRAMEBUFFER;
87 * Open the Frame Buffer Device
90 - fh = OpenFrameBuffer(Opt_fb);
92 + /* First try devfs style name */
93 + Opt_fb = DEFAULT_FRAMEBUFFER_DEVFS;
94 + fh = OpenFrameBuffer(Opt_fb, 0);
95 + Opt_fb = DEFAULT_FRAMEBUFFER;
97 + /* If that fails try normal name */
98 + fh = OpenFrameBuffer(Opt_fb, 1);
101 + /* Open the specified device */
102 + fh = OpenFrameBuffer(Opt_fb, 1);