diff --git a/inxi b/inxi index 0664687..d43c220 100755 --- a/inxi +++ b/inxi @@ -10774,49 +10774,59 @@ sub cp_cpu_arch { $year = '';} # dates uncertain, 1999 start } elsif ($family eq '6'){ - if ($model =~ /^(1|2)$/){ - $arch = 'K7 Athlon Classic'; + ## verified + if ($model =~ /^(6)$/){ + $arch = 'K7'; # 6:2:Palomino, duron + $process = 'AMD 180nm'; + $year = '2002-04';} + elsif ($model =~ /^(8)$/){ + $arch = 'K7'; # 8:1:thoroughbred, duron + $process = 'AMD 130nm'; + $year = '2002-04';} + ## to confirm + elsif ($model =~ /^(1|2)$/){ + $arch = 'K7'; # Athlon Classic $process = 'AMD 180-250nm'; $year = '1999-2002';} elsif ($model =~ /^(3|4)$/){ - $arch = 'K7 Thunderbird'; + $arch = 'K7'; # Thunderbird $process = 'AMD 180nm'; $year = '2000-01';} - elsif ($model =~ /^(6|7|8|A)$/){ - $arch = 'K7 Palomino+'; # athlon xp + elsif ($model =~ /^(7|A)$/){ + $arch = 'K7'; # Palomino+; athlon xp $process = 'AMD 130-180nm'; - $year = '2001';} + $year = '2001-04';} else { $arch = 'K7'; $process = 'AMD 130-250nm'; - $year = '';} + $year = '2001-04';} } # note: family F K8 needs granular breakdowns, was a long lived family elsif ($family eq 'F'){ - # positive IDs, but sub arch difficult, can be stepping based - if ($model =~ /^(7)$/){ - $arch = 'K8'; # 7:A:clawhammer ADA3500DEP4AS + # positive IDs, but sub arch difficult, stepping based + if ($model =~ /^(7|C)$/){ + $arch = 'K8'; # 7:A:clawhammer ADA3500DEP4AS; C:0:NewCastle $process = 'AMD 130nm'; - $year = '2004';} # cpuworld says 2004, but body says 2001 - elsif ($model =~ /^(1C|2F)$/){ - $arch = 'K8'; # 1C:Palermo;2F:A:Venice + $year = '2004-05';} + elsif ($model =~ /^(1C|23|28|2F)$/){ + $arch = 'K8'; # 1C:Palermo;2F:A:Venice; 28:1:Manchester; 23:2:Toledo $process = 'AMD 90nm'; - $year = '2001';} - elsif ($model =~ /^(7F)$/){ - $arch = 'K8 rev.F+'; # Lima + $year = '2004-06';} + elsif ($model =~ /^(6B|7F)$/){ + $arch = 'K8'; # Lima; 68:1:Brisbane $process = 'AMD 65nm'; - $year = '2005';} - # generic IDs, try to reduce these to solid over time - elsif ($model =~ /^(4|5|8|B|C|E|F|14|15|17|18|1B|1F)$/){ + $year = '2005-06';} + ## to confirm + elsif ($model =~ /^(4|5|8|B|E|F|14|15|17|18|1B|1F)$/){ $arch = 'K8'; $process = 'AMD 65-130nm'; $year = '';} - elsif ($model =~ /^(21|23|24|25|27|28|2C)$/){ - $arch = 'K8 rev.E'; + elsif ($model =~ /^(21|24|25|27|2C)$/){ + $arch = 'K8'; # rev.E $process = 'AMD 65-130nm'; $year = '';} - elsif ($model =~ /^(41|43|48|4B|4C|4F|5D|5F|68|6B|6C|6F|7C|C1)$/){ - $arch = 'K8 rev.F+'; + elsif ($model =~ /^(41|43|48|4B|4C|4F|5D|5F|68|6C|6F|7C|C1)$/){ + $arch = 'K8'; # rev.F+ $process = 'AMD 65-130nm'; $year = '';} else {