/[gentoo-src]/Xorgautoconfig/Xorgautoconfig.c
Gentoo

Diff of /Xorgautoconfig/Xorgautoconfig.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.15 Revision 1.16
31#include <netinet/in.h> 31#include <netinet/in.h>
32#include <linux/fb.h> 32#include <linux/fb.h>
33#include <byteswap.h> 33#include <byteswap.h>
34#include <dirent.h> 34#include <dirent.h>
35#include <sys/utsname.h> 35#include <sys/utsname.h>
36#include <pci/pci.h>
36 37
37#include "ddcprobe/common.h" 38#include "ddcprobe/common.h"
38#include "ddcprobe/vesamode.h" 39#include "ddcprobe/vesamode.h"
39#include "Xorgtext.h" 40#include "Xorgtext.h"
40 41
41extern int bus, dev, func; 42extern int bus, dev, func;
42extern void findVideoDevice(void); 43extern void findVideoDevice(pciaddr_t);
43extern void help(); 44extern void help();
44extern void usage(); 45extern void usage();
45extern char * macMachineType(void); 46extern char * macMachineType(void);
46 47
47struct monitor_sync 48struct monitor_sync
82 char dump = FALSE; /* Dump debugging info? */ 83 char dump = FALSE; /* Dump debugging info? */
83 char quiet = FALSE; /* Be quiet */ 84 char quiet = FALSE; /* Be quiet */
84 struct utsname kern; /* Get the kernel version */ 85 struct utsname kern; /* Get the kernel version */
85 char kern_new = FALSE; 86 char kern_new = FALSE;
86 char kern_ver [3]; 87 char kern_ver [3];
87 88
88 uname(&kern); 89 uname(&kern);
89 if(strlen(kern.release) > 6) { 90 if(strlen(kern.release) > 6) {
90 strncpy(kern_ver, (const char *)(&kern.release) + 4, 2); 91 strncpy(kern_ver, (const char *)(&kern.release) + 4, 2);
91 kern_ver[2] = (char) NULL; 92 kern_ver[2] = (char) NULL;
92 93
230 nv = 1; 231 nv = 1;
231 if (!strncmp(fix.id, "OFfb", 4)) 232 if (!strncmp(fix.id, "OFfb", 4))
232 offb = 1; 233 offb = 1;
233 } 234 }
234 235
235 findVideoDevice(); /* For BusID */ 236 /* For BusID */
237 findVideoDevice(fix.mmio_start);
236 238
237 /* Work out the card specifics to figure out if we need DRI, etc. */ 239 /* Work out the card specifics to figure out if we need DRI, etc. */
238 depth = 16; 240 depth = 16;
239 memset(videobuf, 0, MAX_VIDEO_LEN); 241 memset(videobuf, 0, MAX_VIDEO_LEN);
240 if (nv) { 242 if (nv) {

Legend:
Removed from v.1.15  
changed lines
  Added in v.1.16

  ViewVC Help
Powered by ViewVC 1.1.20