Hello community, here is the log from the commit of package hwinfo checked in at Fri Jul 18 22:46:50 CEST 2008. -------- --- hwinfo/hwinfo.changes 2008-06-02 12:33:24.000000000 +0200 +++ hwinfo/hwinfo.changes 2008-07-16 15:16:07.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 16 15:16:01 CEST 2008 - snwint@suse.de + +- updated X11 data +- add fibre channel resource + +------------------------------------------------------------------- Old: ---- hwinfo-14.19.tar.bz2 New: ---- hwinfo-15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.y24321/_old 2008-07-18 22:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.y24321/_new 2008-07-18 22:45:31.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package hwinfo (Version 14.19) +# spec file for package hwinfo (Version 15.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,9 +21,9 @@ PreReq: /sbin/ldconfig %insserv_prereq %fillup_prereq AutoReqProv: on Summary: Hardware Library -Version: 14.19 +Version: 15.0 Release: 1 -Source: hwinfo-14.19.tar.bz2 +Source: hwinfo-15.0.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -95,6 +95,9 @@ %doc doc/libhd/html %changelog +* Wed Jul 16 2008 snwint@suse.de +- updated X11 data +- add fibre channel resource * Mon Jun 02 2008 snwint@suse.de - fix macbook keyboard detection (bnc #374101) * Mon May 26 2008 snwint@suse.de ++++++ hwinfo-14.19.tar.bz2 -> hwinfo-15.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.19/Changelog new/hwinfo-15.0/Changelog --- old/hwinfo-14.19/Changelog 2008-05-30 17:03:57.000000000 +0200 +++ new/hwinfo-15.0/Changelog 2008-07-16 14:55:51.000000000 +0200 @@ -1,3 +1,7 @@ +16/7/2008: v15.0 + - updated X11 data + - add fibre channel resource + 29/5/2008: v14.19 - fix macbook keyboard detection (bnc #374101) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.19/src/hd/block.c new/hwinfo-15.0/src/hd/block.c --- old/hwinfo-14.19/src/hd/block.c 2008-03-11 12:26:22.000000000 +0100 +++ new/hwinfo-15.0/src/hd/block.c 2008-07-16 14:59:36.000000000 +0200 @@ -100,6 +100,15 @@ str_list_t *sf_bus, *sf_bus_e; char *sf_block_dir; + hd_data->lsscsi = free_str_list(hd_data->lsscsi); + hd_data->lsscsi = read_file("|/usr/bin/lsscsi -t 2>/dev/null", 0, 0); + + ADD2LOG("----- lsscsi -----\n"); + for(sl = hd_data->lsscsi; sl; sl = sl->next) { + ADD2LOG(" %s", sl->str); + } + ADD2LOG("----- lsscsi end -----\n"); + sf_bus = reverse_str_list(read_dir("/sys/bus/ide/devices", 'l')); if(sf_bus) { @@ -679,6 +688,9 @@ scsi_t *scsi; hd_res_t *geo, *size; uint64_t ul0; + str_list_t *sl; + char buf[16]; + hd_res_t *res; if(!hd_report_this(hd_data, hd)) return; @@ -786,13 +798,33 @@ break; } } + } + res = new_mem(sizeof *res); + res->any.type = res_fc; + + if(hd->sysfs_bus_id) { + for(sl = hd_data->lsscsi; sl; sl = sl->next) { + if( + sscanf(sl->str, "[%15[^]]] %*s fc:%"SCNx64" , %x ", buf, &ul0, &u0) == 3 && + !strcmp(hd->sysfs_bus_id, buf) + ) { + ADD2LOG(" lsscsi: wwpn = 0x%llx, port_id = 0x%x\n", ul0, u0); + res->fc.wwpn = ul0; + res->fc.wwpn_ok = 1; + res->fc.port_id = u0; + res->fc.port_id_ok = 1; + } + } } /* s390: wwpn & fcp lun */ if(hd_attr_uint(get_sysfs_attr_by_path(sf_dev, "wwpn"), &ul0, 0)) { ADD2LOG(" wwpn = 0x%016"PRIx64"\n", ul0); + res->fc.wwpn = ul0; + res->fc.wwpn_ok = 1; scsi->wwpn = ul0; + scsi->wwpn_ok = 1; /* it's a bit of a hack, actually */ t = new_str(hd_sysfs_id(sf_dev)); @@ -803,6 +835,7 @@ if((s = strrchr(t, '/'))) *s = 0; if((s = strrchr(t, '/'))) { scsi->controller_id = new_str(s + 1); + res->fc.controller_id = new_str(s + 1); } } t = free_mem(t); @@ -810,7 +843,17 @@ if(hd_attr_uint(get_sysfs_attr_by_path(sf_dev, "fcp_lun"), &ul0, 0)) { ADD2LOG(" fcp_lun = 0x%016"PRIx64"\n", ul0); + res->fc.fcp_lun = ul0; + res->fc.fcp_lun_ok = 1; scsi->fcp_lun = ul0; + scsi->fcp_lun_ok = 1; + } + + if(res->fc.wwpn_ok || res->fc.port_id_ok || res->fc.fcp_lun_ok || res->fc.controller_id) { + add_res_entry(&hd->res, res); + } + else { + free_res_list(res); } /* ppc: get rom id */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.19/src/hd/hd.c new/hwinfo-15.0/src/hd/hd.c --- old/hwinfo-14.19/src/hd/hd.c 2008-04-14 17:12:20.000000000 +0200 +++ new/hwinfo-15.0/src/hd/hd.c 2008-07-16 14:58:37.000000000 +0200 @@ -937,6 +937,8 @@ hd_data->hal = hd_free_hal_devices(hd_data->hal); + hd_data->lsscsi = free_str_list(hd_data->lsscsi); + hd_data->last_idx = 0; hd_shm_done(hd_data); @@ -1680,6 +1682,18 @@ free_mem(res->hwaddr.addr); } + if(res->any.type == res_wlan) { + free_str_list(res->wlan.channels); + free_str_list(res->wlan.frequencies); + free_str_list(res->wlan.bitrates); + free_str_list(res->wlan.auth_modes); + free_str_list(res->wlan.enc_modes); + } + + if(res->any.type == res_fc) { + free_mem(res->fc.controller_id); + } + free_mem(res); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.19/src/hd/hd.h new/hwinfo-15.0/src/hd/hd.h --- old/hwinfo-14.19/src/hd/hd.h 2008-05-29 12:12:48.000000000 +0200 +++ new/hwinfo-15.0/src/hd/hd.h 2008-07-16 14:58:40.000000000 +0200 @@ -19,7 +19,7 @@ */ /** Interface version */ -#define HD_VERSION 14 +#define HD_VERSION 15 /** * @defgroup DEBUGpub Debug flags @@ -1138,6 +1138,8 @@ unsigned deleted:1; unsigned generic:1; unsigned fake:1; + unsigned wwpn_ok:1; + unsigned fcp_lun_ok:1; char *dev_name; char *guessed_dev_name; int generic_dev; @@ -1616,7 +1618,7 @@ typedef enum resource_types { res_any, res_phys_mem, res_mem, res_io, res_irq, res_dma, res_monitor, res_size, res_disk_geo, res_cache, res_baud, res_init_strings, res_pppd_option, - res_framebuffer, res_hwaddr, res_link, res_wlan + res_framebuffer, res_hwaddr, res_link, res_wlan, res_fc } hd_resource_types_t; @@ -1788,6 +1790,18 @@ str_list_t *enc_modes; /**< WEP40, WEP104, WEP128, WEP232, TKIP, CCMP */ } res_wlan_t; +typedef struct { + union u_hd_res_t *next; + enum resource_types type; + unsigned wwpn_ok:1; + unsigned fcp_lun_ok:1; + unsigned port_id_ok:1; + uint64_t wwpn; + uint64_t fcp_lun; + unsigned port_id; + char *controller_id; +} res_fc_t; + /** libhd resource union */ typedef union u_hd_res_t { union u_hd_res_t *next; @@ -1808,6 +1822,7 @@ res_hwaddr_t hwaddr; res_link_t link; res_wlan_t wlan; + res_fc_t fc; } hd_res_t; /** @} */ @@ -2672,6 +2687,7 @@ str_list_t *scanner_db; /**< (Internal) list of scanner modules */ edd_info_t edd[0x80]; /**< (Internal) enhanced disk drive data */ hal_device_t *hal; /**< (Internal) HAL data (if any) */ + str_list_t *lsscsi; /**< (Internal) lsscsi result (if any) */ } hd_data_t; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.19/src/hd/hdp.c new/hwinfo-15.0/src/hd/hdp.c --- old/hwinfo-14.19/src/hd/hdp.c 2007-08-22 16:27:16.000000000 +0200 +++ new/hwinfo-15.0/src/hd/hdp.c 2008-07-16 14:41:53.000000000 +0200 @@ -271,24 +271,13 @@ dump_line("Attached to: #%u (%s)\n", h->attached_to, s ?: "?"); } - if(h->detail && h->detail->ccw.type==hd_detail_ccw) + if(h->detail && h->detail->ccw.type == hd_detail_ccw) { dump_line("LCSS: %x.%x\n",h->detail->ccw.data->lcss >> 8, h->detail->ccw.data->lcss & 0xf); dump_line("CU Model: 0x%x\n",h->detail->ccw.data->cu_model); dump_line("Device Model: 0x%x\n",h->detail->ccw.data->dev_model); } -#if defined(__s390__) || defined(__s390x__) - if(h->detail && h->detail->scsi.type==hd_detail_scsi) - { - if(h->detail->scsi.data->wwpn != (uint64_t)-1) - dump_line("WWPN: 0x%llx\n",(unsigned long long)h->detail->scsi.data->wwpn); - if(h->detail->scsi.data->wwpn != (uint64_t)-1) - dump_line("FCP LUN: 0x%llx\n",(unsigned long long)h->detail->scsi.data->fcp_lun); - dump_line("SCSI Host CCW ID: %s\n",h->detail->scsi.data->controller_id); - } -#endif - if( h->base_class.id == bc_storage_device && h->sub_class.id == sc_sdev_cdrom && @@ -780,6 +769,12 @@ } break; + case res_fc: + if(res->fc.wwpn_ok) dump_line("WWPN: 0x%016"PRIx64"\n", res->fc.wwpn); + if(res->fc.fcp_lun_ok) dump_line("FCP LUN: 0x%"PRIx64"\n", res->fc.fcp_lun); + if(res->fc.port_id_ok) dump_line("Port ID: 0x%06x\n", res->fc.port_id); + if(res->fc.controller_id) dump_line("SCSI Host CCW ID: %s\n", res->fc.controller_id); + break; default: dump_line("Unknown resource type %d\n", res->any.type); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.19/src/ids/src/x11.amd64 new/hwinfo-15.0/src/ids/src/x11.amd64 --- old/hwinfo-14.19/src/ids/src/x11.amd64 2008-05-08 14:00:03.000000000 +0200 +++ new/hwinfo-15.0/src/ids/src/x11.amd64 2008-07-16 11:40:19.000000000 +0200 @@ -3516,7 +3516,7 @@ vendor.id pci 0x10de &device.id pci 0x042d +device.name Quadro FX 360M -+driver.xfree 4|nsc ++driver.xfree 4|nv vendor.id pci 0x10de &device.id pci 0x042f @@ -3931,14 +3931,6 @@ vendor.id pci 0x8086 &device.id pci 0x2592 -&subvendor.id pci 0x1014 -&subdevice.id pci 0x0582 -+subdevice.name 915 GM - IBM -+driver.xfree 4|i810 -+driver.xfree 4|i810|3d||dri - - vendor.id pci 0x8086 -&device.id pci 0x2592 &subvendor.id pci 0x1584 &subdevice.id pci 0x9800 +subdevice.name 915 GM @@ -3957,14 +3949,6 @@ +driver.xfree 4|intel|3d||dri vendor.id pci 0x8086 -&device.id pci 0x27a2 -&subvendor.id pci 0x10cf -&subdevice.id pci 0x137a -+subdevice.name 945 GM FSC Lifebook E8110 -+driver.xfree 4|i810 -+driver.xfree 4|i810|3d||dri - - vendor.id pci 0x8086 &device.id pci 0x27ae +device.name 945 GME +driver.xfree 4|intel @@ -4038,14 +4022,6 @@ vendor.id pci 0x8086 &device.id pci 0x3582 -&subvendor.id pci 0x1025 -&subdevice.id pci 0x0035 -+subdevice.name 855 GM Travelmate 661 -+driver.xfree 4|i810 -+driver.xfree 4|i810|3d - - vendor.id pci 0x8086 -&device.id pci 0x3582 &subvendor.id pci 0x1584 &subdevice.id pci 0x9500 +subdevice.name 855 GM diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.19/src/ids/src/x11.i386 new/hwinfo-15.0/src/ids/src/x11.i386 --- old/hwinfo-14.19/src/ids/src/x11.i386 2008-05-08 14:00:04.000000000 +0200 +++ new/hwinfo-15.0/src/ids/src/x11.i386 2008-07-16 11:40:20.000000000 +0200 @@ -260,7 +260,7 @@ vendor.id pci 0x1002 &device.id pci 0x4756 +device.name 3D Rage IIC 215IIC [Mach64 GT IIC] -+driver.xfree 4|fbdev ++driver.xfree 4|ati vendor.id pci 0x1002 &device.id pci 0x4757 @@ -1950,24 +1950,6 @@ +device.name Revolution 4 +driver.xfree 4|i128 - vendor.id pci 0x1078 -+vendor.name Cyrix Corporation - - vendor.id pci 0x1078 -&device.id pci 0x0000 -+device.name 5510 -+driver.xfree 4|cyrix - - vendor.id pci 0x1078 -&device.id pci 0x0002 -+device.name 5520 [Cognac] -+driver.xfree 4|cyrix - - vendor.id pci 0x1078 -&device.id pci 0x0104 -+device.name 5530 Video [Kahlua] -+driver.xfree 4|cyrix - vendor.id pci 0x10c8 +vendor.name Neomagic Corporation @@ -3524,7 +3506,7 @@ vendor.id pci 0x10de &device.id pci 0x042d +device.name Quadro FX 360M -+driver.xfree 4|nsc ++driver.xfree 4|nv vendor.id pci 0x10de &device.id pci 0x042f @@ -3541,19 +3523,6 @@ +device.name GeForce 9600 GT +driver.xfree 4|nv - vendor.id pci 0x10e0 -+vendor.name Imstt - - vendor.id pci 0x10e0 -&device.id pci 0x9128 -+device.name Imstt128 -+driver.xfree 4|imstt - - vendor.id pci 0x10e0 -&device.id pci 0x9135 -+device.name Imstt3D -+driver.xfree 4|imstt - vendor.id pci 0x1142 +vendor.name Alliance Semiconductor Corporation @@ -3949,14 +3918,6 @@ vendor.id pci 0x8086 &device.id pci 0x2592 -&subvendor.id pci 0x1014 -&subdevice.id pci 0x0582 -+subdevice.name 915 GM - IBM -+driver.xfree 4|i810 -+driver.xfree 4|i810|3d||dri - - vendor.id pci 0x8086 -&device.id pci 0x2592 &subvendor.id pci 0x1584 &subdevice.id pci 0x9800 +subdevice.name 915 GM @@ -3975,14 +3936,6 @@ +driver.xfree 4|intel|3d||dri vendor.id pci 0x8086 -&device.id pci 0x27a2 -&subvendor.id pci 0x10cf -&subdevice.id pci 0x137a -+subdevice.name 945 GM FSC Lifebook E8110 -+driver.xfree 4|i810 -+driver.xfree 4|i810|3d||dri - - vendor.id pci 0x8086 &device.id pci 0x27ae +device.name 945 GME +driver.xfree 4|intel @@ -4045,8 +3998,8 @@ vendor.id pci 0x8086 &device.id pci 0x3577 +device.name i830 -+driver.xfree 4|i810 -+driver.xfree 4|i810|3d||dri ++driver.xfree 4|intel ++driver.xfree 4|intel|3d||dri vendor.id pci 0x8086 &device.id pci 0x3582 @@ -4056,14 +4009,6 @@ vendor.id pci 0x8086 &device.id pci 0x3582 -&subvendor.id pci 0x1025 -&subdevice.id pci 0x0035 -+subdevice.name 855 GM Travelmate 661 -+driver.xfree 4|i810 -+driver.xfree 4|i810|3d - - vendor.id pci 0x8086 -&device.id pci 0x3582 &subvendor.id pci 0x1584 &subdevice.id pci 0x9500 +subdevice.name 855 GM diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.19/src/ids/src/x11.ia64 new/hwinfo-15.0/src/ids/src/x11.ia64 --- old/hwinfo-14.19/src/ids/src/x11.ia64 2008-05-08 14:00:05.000000000 +0200 +++ new/hwinfo-15.0/src/ids/src/x11.ia64 2008-07-16 11:40:21.000000000 +0200 @@ -3139,7 +3139,7 @@ vendor.id pci 0x10de &device.id pci 0x042d +device.name Quadro FX 360M -+driver.xfree 4|nsc ++driver.xfree 4|nv vendor.id pci 0x10de &device.id pci 0x042f @@ -3548,12 +3548,6 @@ vendor.id pci 0x8086 &device.id pci 0x2592 -&subvendor.id pci 0x1014 -&subdevice.id pci 0x0582 -+subdevice.name 915 GM - IBM - - vendor.id pci 0x8086 -&device.id pci 0x2592 &subvendor.id pci 0x1584 &subdevice.id pci 0x9800 +subdevice.name 915 GM @@ -3570,12 +3564,6 @@ +driver.xfree 4|i810 vendor.id pci 0x8086 -&device.id pci 0x27a2 -&subvendor.id pci 0x10cf -&subdevice.id pci 0x137a -+subdevice.name 945 GM FSC Lifebook E8110 - - vendor.id pci 0x8086 &device.id pci 0x27ae +device.name 945 GME +driver.xfree 4|intel @@ -3637,13 +3625,6 @@ vendor.id pci 0x8086 &device.id pci 0x3582 -&subvendor.id pci 0x1025 -&subdevice.id pci 0x0035 -+subdevice.name 855 GM Travelmate 661 -+driver.xfree 4|i810 - - vendor.id pci 0x8086 -&device.id pci 0x3582 &subvendor.id pci 0x1584 &subdevice.id pci 0x9500 +subdevice.name 855 GM diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.19/src/ids/src/x11.ppc new/hwinfo-15.0/src/ids/src/x11.ppc --- old/hwinfo-14.19/src/ids/src/x11.ppc 2008-05-08 14:00:06.000000000 +0200 +++ new/hwinfo-15.0/src/ids/src/x11.ppc 2008-07-16 11:40:21.000000000 +0200 @@ -2972,7 +2972,7 @@ vendor.id pci 0x10de &device.id pci 0x042d +device.name Quadro FX 360M -+driver.xfree 4|nsc ++driver.xfree 4|nv vendor.id pci 0x10de &device.id pci 0x042f @@ -3374,12 +3374,6 @@ vendor.id pci 0x8086 &device.id pci 0x2592 -&subvendor.id pci 0x1014 -&subdevice.id pci 0x0582 -+subdevice.name 915 GM - IBM - - vendor.id pci 0x8086 -&device.id pci 0x2592 &subvendor.id pci 0x1584 &subdevice.id pci 0x9800 +subdevice.name 915 GM @@ -3432,13 +3426,6 @@ vendor.id pci 0x8086 &device.id pci 0x3582 -&subvendor.id pci 0x1025 -&subdevice.id pci 0x0035 -+subdevice.name 855 GM Travelmate 661 -+driver.xfree 4|i810 - - vendor.id pci 0x8086 -&device.id pci 0x3582 &subvendor.id pci 0x1584 &subdevice.id pci 0x9500 +subdevice.name 855 GM diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.19/VERSION new/hwinfo-15.0/VERSION --- old/hwinfo-14.19/VERSION 2008-05-29 12:12:35.000000000 +0200 +++ new/hwinfo-15.0/VERSION 2008-07-16 14:54:55.000000000 +0200 @@ -1 +1 @@ -14.19 +15.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org