Skip to content
Permalink
Browse files

Merge branch 'master' into usb3

  • Loading branch information...
lpereira committed Aug 10, 2019
2 parents 7db0825 + 4827b88 commit b9157b3f6520f46e788157fbfe9753b209efe9b7
@@ -120,9 +120,10 @@ set(HARDINFO_MODULES
set(HARDINFO_RESOURCES
"data/benchmark.conf"
"data/benchmark.data"
"data/vendor.ids"
"deps/sysobj_early/data/vendor.ids"
"deps/sysobj_early/data/sdcard.ids"
"deps/sysobj_early/data/usb.ids"
"deps/sysobj_early/data/arm.ids"
)

set(HARDINFO_MANPAGES
@@ -221,6 +222,9 @@ add_library(sysobj_early STATIC
deps/sysobj_early/src/strstr_word.c
deps/sysobj_early/src/auto_free.c
deps/sysobj_early/src/util_ids.c
deps/sysobj_early/src/util_sysobj.c
deps/sysobj_early/src/appf.c
deps/sysobj_early/src/nice_name.c
deps/sysobj_early/gui/uri_handler.c
)
set_target_properties(sysobj_early PROPERTIES COMPILE_FLAGS "-std=c99 -Wall -Wextra -Wno-parentheses -Wno-unused-function")
@@ -322,6 +322,7 @@ PowerPC 740/750=58.07682|280.00 MHz|Unknown
Raspberry_Pi_Model_B_Rev_1;Broadcom_BCM2835;900_00=0.550000; 7.000921; 1; 2|1|Raspberry Pi Model B Rev 1|Broadcom BCM2835|1x ARM ARM1176 r0p7 (AArch32)|1x 900.00 MHz|233612|1|1|1||Broadcom VideoCore IV
ASUS_PRIME_B350_PLUS;AMD_Ryzen_5_1600_Six_Core_Processor;38400_00=97.400000; 7.000335; 12; 2|12|ASUS PRIME B350-PLUS|AMD Ryzen 5 1600 Six-Core Processor|1 physical processor; 6 cores; 12 threads|12x 3200.00 MHz|16423392|1|6|12|Radeon RX 560 Series (POLARIS11, DRM 3.26.0, 4.18.0-10-generic, LLVM 7.0.0)|AMD/ATI Baffin
HP_18E7_(HP_ProDesk_600_G1_SFF);Intel(R)_Core(TM)_i5_4570_CPU___3_20GHz;14400_00=49.490000; 7.000286; 4; 2|4|HP 18E7 (HP ProDesk 600 G1 SFF)|Intel(R) Core(TM) i5-4570 CPU @ 3.20GHz|1 physical processor; 4 cores; 4 threads|4x 3600.00 MHz|8075460|1|4|4|Mesa DRI Intel(R) Haswell Desktop|Intel Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller
Raspberry_Pi_4_Model_B_Rev_1_1;Broadcom_BCM2838;6000_00=12.300000; 7.000401; 4; 2; zlib 1.2.11 (built against: 1.2.11)|4|Raspberry Pi 4 Model B Rev 1.1|Broadcom BCM2838|4x ARM Cortex-A72 r0p3 (AArch32)|4x 1500.00 MHz|3999788|1|4|4|llvmpipe (LLVM 6.0, 128 bits)|Broadcom VideoCore IV

[GPU Drawing]

@@ -335,6 +336,7 @@ Raspberry_Pi_3_Model_B_Plus_Rev_1_3;Broadcom_BCM2837;5600_00 = 3.130000; 7.00043
Firefly_ROC_RK3328_CC;Rockchip_RK3328;5568_00 = 2.580000; 7.000278; 1|1|Firefly ROC-RK3328-CC|Rockchip RK3328|4x ARM Cortex-A53 r0p4 (AArch64)|4x 1392.00 MHz|946208|1|4|4||ARM Mali 450
Hewlett_Packard_18E7_(HP_ProDesk_600_G1_SFF);Intel(R)_Core(TM)_i5_4570_CPU___3_20GHz;14400_00=11.060000; 7.000100; 1|1|Hewlett-Packard 18E7 (HP ProDesk 600 G1 SFF)|Intel(R) Core(TM) i5-4570 CPU @ 3.20GHz|1 physical processor; 4 cores; 4 threads|4x 3600.00 MHz|8078144|1|4|4||Intel Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller
Dell_Computer_0U1426_A00_(PowerEdge_1650);Intel(R)_Pentium(R)_III_CPU___S_________1400MHz;2781_40=4.510000; 7.000350; 1|1|Dell Computer 0U1426 A00 (PowerEdge 1650)|Intel(R) Pentium(R) III CPU - S 1400MHz|2 physical processors; 2 cores; 2 threads|2x 1390.70 MHz|1547816|2|2|2||AMD/ATI Rage XL PCI
Raspberry_Pi_4_Model_B_Rev_1_1;Broadcom_BCM2838;6000_00=4.060000; 7.000188; 1; -1; |1|Raspberry Pi 4 Model B Rev 1.1|Broadcom BCM2838|4x ARM Cortex-A72 r0p3 (AArch32)|4x 1500.00 MHz|3999788|1|4|4|llvmpipe (LLVM 6.0, 128 bits)|Broadcom VideoCore IV

[CPU Blowfish (Multi-thread)]
ASUS_PRIME_B350_PLUS;AMD_Ryzen_5_1600_Six_Core_Processor;38400_00 = 105.7600000 7.000394; 12|12|ASUS PRIME B350-PLUS|AMD Ryzen 5 1600 Six-Core Processor|1 physical processor; 6 cores; 12 threads|12x 3200.00 MHz|16423384|1|6|12|Radeon RX 560 Series (POLARIS11, DRM 3.26.0, 4.18.0-10-generic, LLVM 7.0.0)|AMD/ATI Baffin
@@ -346,6 +348,7 @@ Raspberry_Pi_3_Model_B_Plus_Rev_1_3;Broadcom_BCM2837;5600_00 = 12.430000; 7.0005
Firefly_ROC_RK3328_CC;Rockchip_RK3328;5568_00 = 11.820000; 7.000721; 4|4|Firefly ROC-RK3328-CC|Rockchip RK3328|4x ARM Cortex-A53 r0p4 (AArch64)|4x 1392.00 MHz|946208|1|4|4||ARM Mali 450
Hewlett_Packard_18E7_(HP_ProDesk_600_G1_SFF);Intel(R)_Core(TM)_i5_4570_CPU___3_20GHz;14400_00=42.070000; 7.000221; 4|4|Hewlett-Packard 18E7 (HP ProDesk 600 G1 SFF)|Intel(R) Core(TM) i5-4570 CPU @ 3.20GHz|1 physical processor; 4 cores; 4 threads|4x 3600.00 MHz|8078144|1|4|4||Intel Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller
Dell_Computer_0U1426_A00_(PowerEdge_1650);Intel(R)_Pentium(R)_III_CPU___S_________1400MHz;2781_40=9.020000; 7.000464; 2|2|Dell Computer 0U1426 A00 (PowerEdge 1650)|Intel(R) Pentium(R) III CPU - S 1400MHz|2 physical processors; 2 cores; 2 threads|2x 1390.70 MHz|1547816|2|2|2||AMD/ATI Rage XL PCI
Raspberry_Pi_4_Model_B_Rev_1_1;Broadcom_BCM2838;6000_00=16.240000; 7.000591; 4; -1; |4|Raspberry Pi 4 Model B Rev 1.1|Broadcom BCM2838|4x ARM Cortex-A72 r0p3 (AArch32)|4x 1500.00 MHz|3999788|1|4|4|llvmpipe (LLVM 6.0, 128 bits)|Broadcom VideoCore IV

[CPU Blowfish (Multi-core)]
ASUS_PRIME_B350_PLUS;AMD_Ryzen_5_1600_Six_Core_Processor;38400_00 = 55.190000; 7.000318; 6|6|ASUS PRIME B350-PLUS|AMD Ryzen 5 1600 Six-Core Processor|1 physical processor; 6 cores; 12 threads|12x 3200.00 MHz|16423384|1|6|12|Radeon RX 560 Series (POLARIS11, DRM 3.26.0, 4.18.0-10-generic, LLVM 7.0.0)|AMD/ATI Baffin
@@ -356,3 +359,4 @@ Raspberry_Pi_2_Model_B_Rev_1_1;Broadcom_BCM2836;3600_00 = 6.940000; 7.001310; 4|
Raspberry_Pi_3_Model_B_Plus_Rev_1_3;Broadcom_BCM2837;5600_00 = 12.440000; 7.000483; 4|4|Raspberry Pi 3 Model B Plus Rev 1.3|Broadcom BCM2837|4x ARM Cortex-A53 r0p4 (AArch32)|4x 1400.00 MHz|948952|1|4|4|Gallium 0.4 on llvmpipe (LLVM 3.9, 128 bits)|Broadcom VideoCore IV
Firefly_ROC_RK3328_CC;Rockchip_RK3328;5568_00 = 11.720000; 7.000391; 4|4|Firefly ROC-RK3328-CC|Rockchip RK3328|4x ARM Cortex-A53 r0p4 (AArch64)|4x 1392.00 MHz|946208|1|4|4||ARM Mali 450
Hewlett_Packard_18E7_(HP_ProDesk_600_G1_SFF);Intel(R)_Core(TM)_i5_4570_CPU___3_20GHz;14400_00=42.060000; 7.000452; 4|4|Hewlett-Packard 18E7 (HP ProDesk 600 G1 SFF)|Intel(R) Core(TM) i5-4570 CPU @ 3.20GHz|1 physical processor; 4 cores; 4 threads|4x 3600.00 MHz|8078144|1|4|4||Intel Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller
Raspberry_Pi_4_Model_B_Rev_1_1;Broadcom_BCM2838;6000_00=16.240000; 7.000684; 4; -1; |4|Raspberry Pi 4 Model B Rev 1.1|Broadcom BCM2838|4x ARM Cortex-A72 r0p3 (AArch32)|4x 1500.00 MHz|3999788|1|4|4|llvmpipe (LLVM 6.0, 128 bits)|Broadcom VideoCore IV
@@ -0,0 +1,133 @@
#
# List of ARM CPU IDs
# in a format similar to pci.ids/usb.ids.
#
# Version: 2018.12.22
# Maintained by: Burt P. (pburt0@gmail.com)
# https://github.com/bp0/armids
#
# Syntax:
# implementer implementer_name
# part part_name <-- single tab
#
# <implementer> is two hex digits, <part> is three hex digits, keep in order.
# Comments start with '#'.
#
# This file can be distributed under the GNU General Public License
# (version 2 or higher).
#
# Based on lscpu-arm.c by Riku Voipio <riku.voipio@iki.fi>
#
# The information here is gathered from
# - ARM manuals
# - Linux kernel: arch/armX/include/asm/cputype.h
# - GCC sources: config/arch/arch-cores.def
# - Ancient wisdom
#

41 ARM
810 ARM810
920 ARM920
922 ARM922
926 ARM926
940 ARM940
946 ARM946
966 ARM966
a20 ARM1020
a22 ARM1022
a26 ARM1026
b02 ARM11 MPCore
b36 ARM1136
b56 ARM1156
b76 ARM1176
c05 Cortex-A5
c07 Cortex-A7
c08 Cortex-A8
c09 Cortex-A9
c0d Cortex-A17 # Originally A12
c0f Cortex-A15
c0e Cortex-A17
c14 Cortex-R4
c15 Cortex-R5
c17 Cortex-R7
c18 Cortex-R8
c20 Cortex-M0
c21 Cortex-M1
c23 Cortex-M3
c24 Cortex-M4
c27 Cortex-M7
c60 Cortex-M0+
d01 Cortex-A32
d03 Cortex-A53
d04 Cortex-A35
d05 Cortex-A55
d07 Cortex-A57
d08 Cortex-A72
d09 Cortex-A73
d0a Cortex-A75
d13 Cortex-R52
d20 Cortex-M23
d21 Cortex-M33
42 Broadcom
00f Brahma B15
100 Brahma B53
516 ThunderX2
43 Cavium
0a0 ThunderX
0a1 ThunderX 88XX
0a2 ThunderX 81XX
0a3 ThunderX 83XX
0af ThunderX2 99xx
44 DEC
a10 SA110
a11 SA1100
4e nVidia
000 Denver
003 Denver 2
50 APM
000 X-Gene
51 Qualcomm
00f Scorpion
02d Scorpion
04d Krait
06f Krait
201 Kryo
205 Kryo
211 Kryo
800 Falkor V1/Kryo
801 Kryo V2
c00 Falkor
c01 Saphira
53 Samsung
001 exynos-m1
54 Texas Instruments
56 Marvell
131 Feroceon 88FR131
581 PJ4/PJ4b
584 PJ4B-MP
66 Faraday
526 FA526
626 FA626
69 Intel
200 i80200
210 PXA250A
212 PXA210A
242 i80321-400
243 i80321-600
290 PXA250B/PXA26x
292 PXA210B
2c2 i80321-400-B0
2c3 i80321-600-B0
2d0 PXA250C/PXA255/PXA26x
2d2 PXA210C
2e3 i80219
411 PXA27x
41c IPX425-533
41d IPX425-400
41f IPX425-266
682 PXA32x
683 PXA930/PXA935
688 PXA30x
689 PXA31x
b11 SA1110
c12 IPX1200
@@ -35,7 +35,7 @@ MANFID 00009c Angelbird / Hoodman
OEMID 3432 Kingston # "42"
OEMID 4144 ADATA # "AD"
OEMID 4245 Lexar / Angelbird / Hoodman # "BE"
OEMID 4a45 Transcend # "JE"
OEMID 4a45 Transcend Information # "JE"
OEMID 4a54 Sony # "JT"
OEMID 4a60 Transcend Information # "J`"
OEMID 5041 Panasonic # "PA"
@@ -260,8 +260,12 @@ name Harmony Semiconductor
name_short Harmony
match_string Harmony

name Atheros Communications
url www.atheros.com
name Qualcomm (formerly Atheros)
name_short Qualcomm (Atheros)
url www.qualcomm.com
wikipedia Qualcomm Atheros
ansi_color 0;94;47
match_string Qualcomm Atheros
match_string Atheros

name Panasonic Industry Company
@@ -521,6 +525,78 @@ name STMicroelectronics
match_string STMicroelectronics
match_string ST Micro

name ST-Ericsson
wikipedia ST-Ericsson
ansi_color 0;97;43
match_string ST-Ericsson
match_string ST Ericsson
match_string STEricsson

name Telefonaktiebolaget LM Ericsson
name_short Ericsson
url ericsson.com
wikipedia Ericsson
ansi_color 0;94;107
match_string Ericsson

name Socket Mobile
url www.socketmobile.com
match_string Socket Communications
match_string Socket Mobile
match_string Socket

name GCT Semiconductor
name_short GCT
url www.gctsemi.com
match_string GCT Semiconductor
match_string_case GCT

name Murata Manufacturing
name_short Murata
url www.murata.com
wikipedia Murata Manufacturing
ansi_color 0;31;107
match_string Murata

name Murata Manufacturing (formerly SyChip Electronic Technology)
name_short Murata (SyChip)
ansi_color 0;31;107
match_string SyChip

name Spectec Computer
name_short Spectec
url spectec.com.tw
match_string Spectec

name Siano Mobile Silicon
match_string Siano Mobile Silicon

# NOT Globalsat Group
name Globalsat Technology
match_string Globalsat Technology

name C-guys
url www.c-guys.net
match_string C-guys

name Ricoh
url www.ricoh.com
wikipedia Ricoh
ansi_color 0;91;107
match_string Ricoh

name Brother Industries
name_short Brother
url www.brother.com
wikipedia Brother Industries
ansi_color 0;34;107
match_string Brother

name AboCom Systems
url www.abocom.com.tw
match_string AboCom Systems
match_string AboCom

name Micron Technology
name_short Micron
url www.micron.com
@@ -538,6 +614,7 @@ name Toshiba Samsung Storage Technology
url www.tsst.co.kr
wikipedia Toshiba Samsung Storage Technology
ansi_color 0;34;107
match_string TSSTcorp
match_string_case TSST

name Seagate Technology
@@ -689,6 +766,21 @@ name Elitegroup Computer Systems
ansi_color 0;36;41
match_string_case ECS

name JMicron Technology
name_short JMicron
url www.jmicron.com
wikipedia JMicron
ansi_color 0;34;107
match_string JMicron Technology
match_string JMicron USA Technology
match_string JMicron

name Sabrent
url www.sabrent.com
wikipedia Sabrent
ansi_color 0;30;44
match_string Sabrent
match_string Arkview

name Sanyo Electric
name_short SANYO
@@ -790,6 +882,7 @@ name Red Hat
url www.redhat.com
ansi_color 0;31;40
match_string Red Hat
match_string RedHat

name Sun Microsystems
name_short Sun
@@ -910,6 +1003,70 @@ name DMP Electronics
note x86 processor vendor ID
match_string Vortex86 SoC

name Digital Equipment Corporation
name_short DEC
note Dead; various parts to Intel, Compaq, HP
match_string_case DEC
match_string Digital Equipment
match_string Digital

name Marvell Technology Group
name_short Marvell
url www.marvell.com
wikipedia Marvell Technology Group
ansi_color 0;97;41
match_string Marvell

name Marvell (formerly Cavium)
name_short Marvell (Cavium)
url cavium.com
wikipedia Cavium
ansi_color 0;97;41
match_string Cavium

name Applied Micro Circuits
name_short APM
wikipedia Applied Micro Circuits Corporation
match_string Applied Micro Circuits
match_string AppliedMicro
match_string_case APM
match_string_case AMCC

name Faraday Technology
name_short Faraday
url www.faraday-tech.com
wikipedia Faraday Technology
match_string Faraday Technology
match_string Faraday

name Texas Instruments
name_short TI
url ti.com
wikipedia Texas Instruments
ansi_color 0;97;40
match_string Texas Instruments
match_string_case TI

name Allwinner Technology
name_short AllWinner
url www.allwinnertech.com
wikipedia Allwinner Technology
ansi_color 0;97;44
match_string AllWinner

name Amlogic
name_short AMLogic
url www.amlogic.com
wikipedia Amlogic
ansi_color 0;94;107
match_string Amlogic

name MediaTek
url www.mediatek.com
wikipedia MediaTek
ansi_color 0;97;43
match_string MediaTek

#
# x86 VM vendor strings
#

0 comments on commit b9157b3

Please sign in to comment.
You can’t perform that action at this time.