Author: rudolfc Date: 2010-06-16 21:32:31 +0200 (Wed, 16 Jun 2010) New Revision: 37157 Changeset: http://dev.haiku-os.org/changeset/37157/haiku Modified: haiku/trunk/src/add-ons/accelerants/nvidia/engine/nv_general.c haiku/trunk/src/add-ons/kernel/drivers/graphics/nvidia/driver.c Log: added recognition for case 0x03d510de: /* Nvidia Geforce 6100 nForce 420 */ Modified: haiku/trunk/src/add-ons/accelerants/nvidia/engine/nv_general.c =================================================================== --- haiku/trunk/src/add-ons/accelerants/nvidia/engine/nv_general.c 2010-06-16 18:47:34 UTC (rev 37156) +++ haiku/trunk/src/add-ons/accelerants/nvidia/engine/nv_general.c 2010-06-16 19:32:31 UTC (rev 37157) @@ -797,17 +797,23 @@ status = nvxx_general_powerup(); break; case 0x024010de: /* Nvidia Geforce 6150 (NFORCE4 Integr.GPU) */ + si->ps.card_type = NV44; + si->ps.card_arch = NV40A; + sprintf(si->adi.name, "Nvidia Geforce 6150, C51PV"); + sprintf(si->adi.chipset, "NV44"); + status = nvxx_general_powerup(); + break; case 0x024110de: /* Nvidia Geforce 6150 LE (NFORCE4 Integr.GPU) */ si->ps.card_type = NV44; si->ps.card_arch = NV40A; - sprintf(si->adi.name, "Nvidia Geforce 6150"); + sprintf(si->adi.name, "Nvidia Geforce 6150, C51"); sprintf(si->adi.chipset, "NV44"); status = nvxx_general_powerup(); break; case 0x024210de: /* Nvidia Geforce 6100 (NFORCE4 Integr.GPU) */ si->ps.card_type = NV44; si->ps.card_arch = NV40A; - sprintf(si->adi.name, "Nvidia Geforce 6100"); + sprintf(si->adi.name, "Nvidia Geforce 6100, C51G"); sprintf(si->adi.chipset, "NV44"); status = nvxx_general_powerup(); break; @@ -815,14 +821,14 @@ si->ps.card_type = NV44; si->ps.card_arch = NV40A; si->ps.laptop = true; - sprintf(si->adi.name, "Nvidia Geforce 6150 Go"); + sprintf(si->adi.name, "Nvidia Geforce 6150 Go, C51"); sprintf(si->adi.chipset, "NV44"); status = nvxx_general_powerup(); break; case 0x024510de: /* Nvidia Quadro NVS 210S / NVIDIA Geforce 6150LE (NFORCE4 Integr.GPU) */ si->ps.card_type = NV44; si->ps.card_arch = NV40A; - sprintf(si->adi.name, "Nvidia Geforce 6150"); + sprintf(si->adi.name, "Nvidia Geforce 6150, C51"); sprintf(si->adi.chipset, "NV44"); status = nvxx_general_powerup(); break; @@ -830,7 +836,7 @@ si->ps.card_type = NV44; si->ps.card_arch = NV40A; si->ps.laptop = true; - sprintf(si->adi.name, "Nvidia Geforce 6100 Go"); + sprintf(si->adi.name, "Nvidia Geforce 6100 Go, C51"); sprintf(si->adi.chipset, "NV44"); status = nvxx_general_powerup(); break; @@ -1261,9 +1267,10 @@ case 0x03d010de: /* Nvidia Geforce 6100 nForce 430 */ case 0x03d110de: /* Nvidia Geforce 6100 nForce 405 */ case 0x03d210de: /* Nvidia Geforce 6100 nForce 400 */ + case 0x03d510de: /* Nvidia Geforce 6100 nForce 420 */ si->ps.card_type = NV44; si->ps.card_arch = NV40A; - sprintf(si->adi.name, "Nvidia Geforce 6100 nForce"); + sprintf(si->adi.name, "Nvidia Geforce 6100 nForce, C61"); sprintf(si->adi.chipset, "NV44"); status = nvxx_general_powerup(); break; Modified: haiku/trunk/src/add-ons/kernel/drivers/graphics/nvidia/driver.c =================================================================== --- haiku/trunk/src/add-ons/kernel/drivers/graphics/nvidia/driver.c 2010-06-16 18:47:34 UTC (rev 37156) +++ haiku/trunk/src/add-ons/kernel/drivers/graphics/nvidia/driver.c 2010-06-16 19:32:31 UTC (rev 37157) @@ -325,6 +325,7 @@ 0x03d0, /* Nvidia Geforce 6100 nForce 430 */ 0x03d1, /* Nvidia Geforce 6100 nForce 405 */ 0x03d2, /* Nvidia Geforce 6100 nForce 400 */ + 0x03d5, /* Nvidia Geforce 6100 nForce 420 */ 0x07e1, /* Nvidia Geforce 7100 / nForce 630i */ 0 };