diff --git a/inxi b/inxi index b0a32dc..ebc801e 100755 --- a/inxi +++ b/inxi @@ -2,7 +2,7 @@ ######################################################################## SELF_NAME='inxi' # don't quote the following, parsers grab these too -SELF_VERSION=2.3.33 +SELF_VERSION=2.3.34 SELF_DATE=2017-08-04 SELF_PATCH=00 ######################################################################## @@ -4430,6 +4430,7 @@ get_cpu_architecture() 6|7)ARCH='K6';; 8)ARCH='K6-2';; 9|D)ARCH='K6-3';; + A)ARCH='Geode';; esac ;; 6) @@ -4473,9 +4474,10 @@ get_cpu_architecture() ;; 15) case $3 in - 1)ARCH='Bulldozer';; + 0|1)ARCH='Bulldozer';; 2|10|13)ARCH='Piledriver';; - 30)ARCH='Steamroller';; + 30|38)ARCH='Steamroller';; + 60|65|70)ARCH='Excavator';; *)ARCH='Bulldozer';; esac ;; @@ -4501,7 +4503,7 @@ get_cpu_architecture() ARCH='ARM' fi ;; - centaur) + centaur) # aka VIA case $2 in 5) case $3 in @@ -4540,21 +4542,27 @@ get_cpu_architecture() 1)ARCH='P6 Pro';; 3|5|6)ARCH='P6 II';; 7|8|A|B)ARCH='P6 III';; - 9|15)ARCH='Mobile';; # pentium M - D)ARCH='Mobile Dothan';; # Pentium M - E)ARCH='Core Yonah';; - F)ARCH='Core 2';; - 17|1D)ARCH='Core Penryn';; - 1A|1E|2E)ARCH='Nehalem';; - 1C|35|36)ARCH='Bonnell';; + 9)ARCH='Banias';; # pentium M + 15)ARCH='Dothan Tolapai';; # pentium M system on chip + D)ARCH='Dothan';; # Pentium M + E)ARCH='Yonah';; + F|16)ARCH='Conroe';; + 17|1D)ARCH='Penryn';; + 1A|1E|1F|2E|25|2C|2F)ARCH='Nehalem';; + 1C|26)ARCH='Bonnell';; + 27|35|36)ARCH='Saltwell';; 25|2C|2F)ARCH='Westmere';; 26|27)ARCH='Bonnell';; 2A|2D)ARCH='Sandy Bridge';; - 37|4A|4D)ARCH='Silvermont';; + 37|4A|4D|5A)ARCH='Silvermont';; 3A|3E)ARCH='Ivy Bridge';; 3C|3F|45|46)ARCH='Haswell';; - 3D)ARCH='Broadwell';; - 4E)ARCH='Skylake';; + 3D|47|4F|56)ARCH='Broadwell';; + 4E|55|9E)ARCH='Skylake';; + 4C|5D)ARCH='Airmont';; + 8E|9E)ARCH='Kaby Lake';; + 57)ARCH='Knights Landing';; + 85)ARCH='Knights Mill';; esac ;; B) @@ -4564,7 +4572,7 @@ get_cpu_architecture() ;; F) case $3 in - 0|1|2)ARCH='Netburst';; + 0|1|2)ARCH='Netburst Willamette';; 3|4|6)ARCH='Netburst Prescott';; # Nocona *)ARCH='Netburst';; esac diff --git a/inxi.changelog b/inxi.changelog index fa0ce52..b7ca3d0 100644 --- a/inxi.changelog +++ b/inxi.changelog @@ -1,3 +1,15 @@ +===================================================================================== +Version: 2.3.34 +Patch Version: 00 +Script Date: 2017-08-04 +----------------------------------- +Changes: +----------------------------------- +New version, tarball. Added to cpu microarch lists. + +----------------------------------- +-- Harald Hope - Fri, 04 Aug 2017 16:11:59 -0700 + ===================================================================================== Version: 2.3.33 Patch Version: 00