Hello community, here is the log from the commit of package hwinfo for openSUSE:13.1 checked in at 2013-10-11 08:51:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/hwinfo (Old) and /work/SRC/openSUSE:13.1/.hwinfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hwinfo" Changes: -------- --- /work/SRC/openSUSE:13.1/hwinfo/hwinfo.changes 2013-09-23 10:53:39.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.hwinfo.new/hwinfo.changes 2013-10-11 08:51:42.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Oct 7 13:46:43 CEST 2013 - snw...@suse.de + +- AArch64 support +- Add support for AArch64 +- Add a new CPU Arch Type, AArch64, and properly +- parse the /proc/cpuinfo (that is quite similar to ARM 32bit) +- Remove various unused variables +- Fix sizing error in memset() call + +------------------------------------------------------------------- Old: ---- hwinfo-20.1.tar.bz2 New: ---- hwinfo-20.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.ao2PkS/_old 2013-10-11 08:51:42.000000000 +0200 +++ /var/tmp/diff_new_pack.ao2PkS/_new 2013-10-11 08:51:42.000000000 +0200 @@ -36,9 +36,9 @@ Group: Hardware/Other # Until migration to github this should be correct url Url: http://gitorious.org/opensuse/hwinfo -Version: 20.1 +Version: 20.2 Release: 0 -Source: hwinfo-20.1.tar.bz2 +Source: hwinfo-20.2.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ hwinfo-20.1.tar.bz2 -> hwinfo-20.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-20.1/VERSION new/hwinfo-20.2/VERSION --- old/hwinfo-20.1/VERSION 2013-01-09 13:57:57.000000000 +0100 +++ new/hwinfo-20.2/VERSION 2013-10-07 13:46:41.000000000 +0200 @@ -1 +1 @@ -20.1 +20.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-20.1/changelog new/hwinfo-20.2/changelog --- old/hwinfo-20.1/changelog 2013-01-09 13:57:59.000000000 +0100 +++ new/hwinfo-20.2/changelog 2013-10-07 13:46:42.000000000 +0200 @@ -1,4 +1,15 @@ -2013-01-09: HEAD +2013-08-20: HEAD + - Merge pull request #1 from dirkmueller/aarch64 + - AArch64 support + - Add support for AArch64 + - Add a new CPU Arch Type, AArch64, and properly + - parse the /proc/cpuinfo (that is quite similar to ARM 32bit) + - Remove various unused variables + - GCC 4.8 warns about them, and they seem to be entirely + - unused. + - Fix sizing error in memset() call + +2013-01-09: 20.1 - Boris Manojlovic: add missing man pages 2012-05-22: 20.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-20.1/hwinfo.c new/hwinfo-20.2/hwinfo.c --- old/hwinfo-20.1/hwinfo.c 2013-01-09 13:57:39.000000000 +0100 +++ new/hwinfo-20.2/hwinfo.c 2013-10-07 13:45:32.000000000 +0200 @@ -621,6 +621,9 @@ case arch_x86_64: s = "X86_64"; break; + case arch_aarch64: + s = "AArch64"; + break; } switch(b_arch) { @@ -1120,7 +1123,6 @@ driver_info_t *di; char *x11i; int fb_mode, kbd_ok = 0; - unsigned yast2_color = 0; char *xkbrules = NULL, *xkbmodel = NULL, *xkblayout = NULL; char *xserver, *version, *busid; driver_info_t *x11_driver; @@ -1151,24 +1153,6 @@ xserver = get_xserver(hd_data, &version, &busid, &x11_driver); - switch(hd_mac_color(hd_data)) { - case 0x01: - yast2_color = 0x5a4add; - break; - case 0x04: - yast2_color = 0x32cd32; - break; - case 0x05: - yast2_color = 0xff7f50; - break; - case 0x07: - yast2_color = 0x000000; - break; - case 0xff: - yast2_color = 0x7f7f7f; - break; - } - if(hd_data->progress) { printf("\r%64s\r", ""); fflush(stdout); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-20.1/src/hd/cpu.c new/hwinfo-20.2/src/hd/cpu.c --- old/hwinfo-20.1/src/hd/cpu.c 2013-01-09 13:57:39.000000000 +0100 +++ new/hwinfo-20.2/src/hd/cpu.c 2013-10-07 13:45:32.000000000 +0200 @@ -115,6 +115,14 @@ char *t0, *t; #endif +#ifdef __aarch64__ + char model_id[80], system_id[80], serial_number[80], features[0x400]; + unsigned cpu_variation, cpu_revision, vendor_id; + unsigned u; + double bogo; + char *t0, *t; +#endif + #ifdef __PPC__ char model_id[80], vendor_id[80], motherboard[80]; unsigned mhz, cache, family, model, stepping; @@ -262,6 +270,70 @@ } #endif /* __arm__ */ +#ifdef __aarch64__ + *model_id = *system_id = *serial_number = 0; + cpu_variation = cpu_revision = 0; + ct = 0; bogo = 0; + + hd_data->boot = boot_uboot; + + for(sl = hd_data->cpu; sl; sl = sl->next) { + if(sscanf(sl->str, "Processor : %79[^\n]", model_id) == 1) continue; + if(sscanf(sl->str, "Hardware : %79[^\n]", system_id) == 1) continue; + if(sscanf(sl->str, "Features : %1000[^\n]", features) == 1) continue; + if(sscanf(sl->str, "CPU variant : 0x%x", &cpu_variation) == 1) continue; + if(sscanf(sl->str, "CPU implementer : 0x%x", &vendor_id) == 1) continue; + if(sscanf(sl->str, "CPU revision : %d", &cpu_revision) == 1) continue; + if(!bogo && sscanf(sl->str, "BogoMIPS : %lg", &bogo) == 1); + if(strstr(sl->str, "processor\t: ") == sl->str) cpus++; + } + + /* if we didn't find any cpus, we might be running under qemu. + So simulate just one CPU to make the rest happy. */ + if(!cpus) cpus = 1; + for(u = 0; u < cpus; u++) { + ct = new_mem(sizeof *ct); + ct->architecture = arch_aarch64; + ct->family = cpu_variation; + ct->model = cpu_revision; + ct->stepping = 0; + ct->cache = 0; + ct->clock = 0; + ct->bogo = bogo; + ct->platform = 0; + if(*system_id) ct->platform = new_str(system_id); + if(*model_id) ct->model_name = new_str(model_id); + + switch (vendor_id) { + case 0x41: ct->vend_name = new_str("ARM Limited"); break; + case 0x44: ct->vend_name = new_str("Digital Equipment Corporation"); break; + case 0x4d: ct->vend_name = new_str("Motorola, Freescale Semiconductor Inc."); break; + case 0x51: ct->vend_name = new_str("QUALCOMM Inc."); break; + case 0x56: ct->vend_name = new_str("Marvell Semiconductor Inc."); break; + case 0x69: ct->vend_name = new_str("Intel Corporation."); break; + default: + { + char buf[80]; + sprintf(buf, "unknown (%x)", vendor_id); + ct->vend_name = new_str(buf); + } + } + + if(*features) { + for(t0 = features; (t = strsep(&t0, " ")); ) { + add_str_list(&ct->features, t); + } + } + + hd = add_hd_entry(hd_data, __LINE__, 0); + hd->base_class.id = bc_internal; + hd->sub_class.id = sc_int_cpu; + hd->slot = u; + hd->detail = new_mem(sizeof *hd->detail); + hd->detail->type = hd_detail_cpu; + hd->detail->cpu.data = ct; + } +#endif /* __aarch64__ */ #ifdef __sparc__ *cpu_id = *fpu_id = *promlib = *prom = *type = *mmu = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-20.1/src/hd/hd.c new/hwinfo-20.2/src/hd/hd.c --- old/hwinfo-20.1/src/hd/hd.c 2013-01-09 13:57:39.000000000 +0100 +++ new/hwinfo-20.2/src/hd/hd.c 2013-10-07 13:45:32.000000000 +0200 @@ -131,6 +131,10 @@ #define HD_ARCH "arm" #endif +#ifdef __aarch64__ +#define HD_ARCH "aarch64" +#endif + #ifdef __mips__ #define HD_ARCH "mips" #endif @@ -1480,7 +1484,7 @@ if(!free_all) { next = scsi->next; - memset(scsi, 0, sizeof scsi); + memset(scsi, 0, sizeof *scsi); scsi->next = next; break; } @@ -3056,10 +3060,14 @@ #ifdef __arm__ return arch_arm; #else +#ifdef __aarch64__ + return arch_aarch64; +#else return arch_unknown; #endif #endif #endif +#endif #endif #endif #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-20.1/src/hd/hd.h new/hwinfo-20.2/src/hd/hd.h --- old/hwinfo-20.1/src/hd/hd.h 2013-01-09 13:57:39.000000000 +0100 +++ new/hwinfo-20.2/src/hd/hd.h 2013-10-07 13:45:32.000000000 +0200 @@ -1437,7 +1437,8 @@ arch_s390, arch_s390x, arch_arm, arch_mips, - arch_x86_64 + arch_x86_64, + arch_aarch64 } hd_cpu_arch_t; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-20.1/src/hd/hdp.c new/hwinfo-20.2/src/hd/hdp.c --- old/hwinfo-20.1/src/hd/hdp.c 2013-01-09 13:57:39.000000000 +0100 +++ new/hwinfo-20.2/src/hd/hdp.c 2013-10-07 13:45:32.000000000 +0200 @@ -1096,6 +1096,9 @@ case arch_x86_64: dump_line0 ("X86-64\n"); break; + case arch_aarch64: + dump_line0 ("AArch64\n"); + break; default: dump_line0 ("**UNKNWON**\n"); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-20.1/src/hd/mdt.c new/hwinfo-20.2/src/hd/mdt.c --- old/hwinfo-20.1/src/hd/mdt.c 2013-01-09 13:57:39.000000000 +0100 +++ new/hwinfo-20.2/src/hd/mdt.c 2013-10-07 13:45:32.000000000 +0200 @@ -460,7 +460,7 @@ { x86emu_t *emu = NULL; int err = 0, i; - double d1, d2, timeout; + double d1, d2; unsigned char buf2[0x100], tmp[0x100]; unsigned u, ml; unsigned modelist[0x100]; @@ -471,8 +471,6 @@ LPRINTF("=== running bios\n"); - timeout = get_time() + (vm->timeout ?: 20); - emu = x86emu_clone(vm->emu); emu->x86.R_EAX = 0x4f00; @@ -788,12 +786,10 @@ { x86emu_t *emu = NULL; int err = 0; - double d, timeout; + double d; LPRINTF("=== running bios\n"); - timeout = get_time() + (vm->timeout ?: 20); - emu = x86emu_clone(vm->emu); emu->x86.R_EAX = 0x4f03; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
