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

Diff of /Xorgautoconfig/Xorgautoconfig.c

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

Revision 1.19 Revision 1.20
319 dri = FALSE; /* Can this be enabled? */ 319 dri = FALSE; /* Can this be enabled? */
320 break; 320 break;
321 /* ATI Rage 128 Family */ 321 /* ATI Rage 128 Family */
322 case 32: 322 case 32:
323 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "%s", driver_r128); 323 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "%s", driver_r128);
324 if(kern_new)
325 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "\tOption\t\"UseFBDev\"\t\"False\"\n");
326 else
327 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "\tOption\t\"UseFBDev\"\t\"True\"\n");
328 videolen -= snprintf(videobuf + strlen(videobuf), videolen, " Driver\t\"r128\"\n"); 324 videolen -= snprintf(videobuf + strlen(videobuf), videolen, " Driver\t\"r128\"\n");
329 dri = TRUE; 325 dri = TRUE;
330 break; 326 break;
331 /* ATI Radeon */ 327 /* ATI Radeon */
332 case 38: 328 case 38:
333 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "%s", driver_radeon); 329 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "%s", driver_radeon);
334 if(!strncmp(macid + 5, "Pegasos", 7)) 330 if(!strncmp(macid + 5, "Pegasos", 7))
335 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "%s", "\tOption\t\"BusType\"\t\"PCI\"\n"); 331 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "%s", "\tOption\t\"BusType\"\t\"PCI\"\n");
336 if(kern_new)
337 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "\tOption\t\"UseFBDev\"\t\"False\"\n");
338 else
339 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "\tOption\t\"UseFBDev\"\t\"True\"\n");
340 videolen -= snprintf(videobuf + strlen(videobuf), videolen, " Driver\t\"radeon\"\n"); 332 videolen -= snprintf(videobuf + strlen(videobuf), videolen, " Driver\t\"radeon\"\n");
341 dri = TRUE; 333 dri = TRUE;
342 break; 334 break;
343 default: 335 default:
344 if (!strncmp(fix.id, "ATI Radeon", 10)) { 336 if (!strncmp(fix.id, "ATI Radeon", 10)) {
345 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "%s", driver_radeon); 337 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "%s", driver_radeon);
346 if(!strncmp(macid + 5, "Pegasos", 7)) 338 if(!strncmp(macid + 5, "Pegasos", 7))
347 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "%s", "\tOption\t\"BusType\"\t\"PCI\"\n"); 339 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "%s", "\tOption\t\"BusType\"\t\"PCI\"\n");
348 if(kern_new)
349 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "\tOption\t\"UseFBDev\"\t\"False\"\n");
350 else
351 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "\tOption\t\"UseFBDev\"\t\"True\"\n");
352 videolen -= snprintf(videobuf + strlen(videobuf), videolen, " Driver\t\"radeon\"\n"); 340 videolen -= snprintf(videobuf + strlen(videobuf), videolen, " Driver\t\"radeon\"\n");
353 dri = TRUE; 341 dri = TRUE;
354 } else if (!strncmp(fix.id, "Rage128", 7)) { 342 } else if (!strncmp(fix.id, "Rage128", 7)) {
355 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "%s", driver_r128); 343 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "%s", driver_r128);
356 if(kern_new)
357 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "\tOption\t\"UseFBDev\"\t\"False\"\n");
358 else
359 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "\tOption\t\"UseFBDev\"\t\"True\"\n");
360 videolen -= snprintf(videobuf + strlen(videobuf), videolen, " Driver\t\"r128\"\n"); 344 videolen -= snprintf(videobuf + strlen(videobuf), videolen, " Driver\t\"r128\"\n");
361 dri = TRUE; 345 dri = TRUE;
362 } else if (!strncmp(fix.id, "Rage Mobility M3", 16)) { 346 } else if (!strncmp(fix.id, "Rage Mobility M3", 16)) {
363 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "%s", driver_r128); 347 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "%s", driver_r128);
364 if(kern_new)
365 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "\tOption\t\"UseFBDev\"\t\"False\"\n");
366 else
367 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "\tOption\t\"UseFBDev\"\t\"True\"\n");
368 videolen -= snprintf(videobuf + strlen(videobuf), videolen, " Driver\t\"r128\"\n"); 348 videolen -= snprintf(videobuf + strlen(videobuf), videolen, " Driver\t\"r128\"\n");
369 dri = TRUE; 349 dri = TRUE;
370 } else { 350 } else {
371 videolen -= snprintf(videobuf + strlen(videobuf), videolen, " #Option \"ShadowFB\" \"true\"\n"); 351 videolen -= snprintf(videobuf + strlen(videobuf), videolen, " #Option \"ShadowFB\" \"true\"\n");
372 videolen -= snprintf(videobuf + strlen(videobuf), videolen, " Driver\t\"fbdev\"\n"); 352 videolen -= snprintf(videobuf + strlen(videobuf), videolen, " Driver\t\"fbdev\"\n");
373 dri = FALSE; 353 dri = FALSE;
374 depth = 15; 354 depth = 15;
375 } 355 }
376 break; 356 break;
377 } 357 }
378 videolen -= snprintf(videobuf + strlen(videobuf), videolen, " BusID \"PCI:%d:%d:%d\"\n", bus, dev, func); 358 videolen -= snprintf(videobuf + strlen(videobuf), videolen, "# BusID \"PCI:%d:%d:%d\"\n", bus, dev, func);
379 } 359 }
380 360
381 if(dump) { 361 if(dump) {
382 printf("Dumping Debugging Information:\n"); 362 printf("Dumping Debugging Information:\n");
383 printf("\tMachine ID:\t%s\n", macid); 363 printf("\tMachine ID:\t%s\n", macid);

Legend:
Removed from v.1.19  
changed lines
  Added in v.1.20

  ViewVC Help
Powered by ViewVC 1.1.20