Hello community, here is the log from the commit of package hwinfo checked in at Tue Sep 25 21:07:07 CEST 2007. -------- --- hwinfo/hwinfo.changes 2007-09-24 15:48:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/STABLE/hwinfo/hwinfo.changes 2007-09-25 13:50:45.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 25 13:50:42 CEST 2007 - snwint@suse.de + +- braille: fix el2d detection; wait longer in ht code +- fix mv643xx detection (#300613) + +------------------------------------------------------------------- Old: ---- hwinfo-13.56.tar.bz2 New: ---- hwinfo-13.57.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.Qx4380/_old 2007-09-25 21:06:44.000000000 +0200 +++ /var/tmp/diff_new_pack.Qx4380/_new 2007-09-25 21:06:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package hwinfo (Version 13.56) +# spec file for package hwinfo (Version 13.57) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,9 +20,9 @@ PreReq: /sbin/ldconfig %insserv_prereq %fillup_prereq AutoReqProv: on Summary: Hardware Library -Version: 13.56 +Version: 13.57 Release: 1 -Source: hwinfo-13.56.tar.bz2 +Source: hwinfo-13.57.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -88,6 +88,9 @@ /usr/include/hd.h %doc doc/libhd/html %changelog +* Tue Sep 25 2007 - snwint@suse.de +- braille: fix el2d detection; wait longer in ht code +- fix mv643xx detection (#300613) * Mon Sep 24 2007 - snwint@suse.de - updated X11 data (#326503) * Mon Sep 24 2007 - snwint@suse.de ++++++ hwinfo-13.56.tar.bz2 -> hwinfo-13.57.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.56/Changelog new/hwinfo-13.57/Changelog --- old/hwinfo-13.56/Changelog 2007-09-24 15:48:20.000000000 +0200 +++ new/hwinfo-13.57/Changelog 2007-09-25 12:56:11.000000000 +0200 @@ -1,3 +1,7 @@ +25/9/2007: v13.57 + - braille: fix el2d detection; wait longer in ht code + - fix mv643xx detection (#300613) + 24/9/2007: v13.56 - updated X11 data (#326503) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.56/isdn.diff new/hwinfo-13.57/isdn.diff --- old/hwinfo-13.56/isdn.diff 2007-09-20 18:23:23.000000000 +0200 +++ new/hwinfo-13.57/isdn.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,94 +0,0 @@ ---- VERSION (revision 1787) -+++ VERSION (working copy) -@@ -1 +1 @@ --13.54 -+13.55 ---- Changelog (revision 1787) -+++ Changelog (working copy) -@@ -1,3 +1,6 @@ -+20/9/2007: v13.55 -+ - put isa probing into subprocess (#308671) -+ - 18/9/2007: v13.54 - - updated X11 data - ---- src/hd/isa.c (revision 1784) -+++ src/hd/isa.c (working copy) -@@ -17,7 +17,7 @@ - #if defined(__i386__) - - static void scan_isa_isdn(hd_data_t *hd_data); --static isa_isdn_t *free_isa_isdn(isa_isdn_t *ii); -+// static isa_isdn_t *free_isa_isdn(isa_isdn_t *ii); - - static void dump_isa_isdn_data(hd_data_t *hd_data, isa_isdn_t *ii); - -@@ -39,19 +39,37 @@ - - void scan_isa_isdn(hd_data_t *hd_data) - { -- isa_isdn_t *ii0, *ii; -+ isa_isdn_t *ii, *ii1 = NULL, *ii2, **isdn_ptr = NULL; - hd_t *hd; - hd_res_t *res; - - PROGRESS(1, 0, "isdn"); - -- ii0 = isdn_detect(); -+ isdn_ptr = hd_shm_add(hd_data, NULL, sizeof *isdn_ptr); - -- dump_isa_isdn_data(hd_data, ii0); -+ hd_fork(hd_data, 10, 10); - -+ if(hd_data->flags.forked) { -+ for(ii = isdn_detect(); ii; ii = ii->next) { -+ ii2 = hd_shm_add(hd_data, ii, sizeof *ii); -+ if(!*isdn_ptr) { -+ *isdn_ptr = ii2; -+ } -+ else { -+ ii1->next = ii2; -+ } -+ ii1 = ii2; -+ ii1->next = NULL; -+ } -+ } -+ -+ hd_fork_done(hd_data); -+ -+ dump_isa_isdn_data(hd_data, *isdn_ptr); -+ - PROGRESS(1, 1, "isdn"); - -- for(ii = ii0; ii; ii = ii->next) { -+ for(ii = *isdn_ptr; ii; ii = ii->next) { - hd = add_hd_entry(hd_data, __LINE__, 0); - hd->bus.id = bus_isa; - hd->base_class.id = bc_isdn; -@@ -77,7 +95,8 @@ - - } - -- free_isa_isdn(ii0); -+ hd_shm_clean(hd_data); -+ // free_isa_isdn(ii0); - } - - isa_isdn_t *new_isa_isdn(isa_isdn_t **ii) -@@ -87,6 +106,8 @@ - return *ii = new_mem(sizeof **ii); - } - -+ -+#if 0 - isa_isdn_t *free_isa_isdn(isa_isdn_t *ii) - { - isa_isdn_t *l; -@@ -95,6 +116,7 @@ - - return NULL; - } -+#endif - - void dump_isa_isdn_data(hd_data_t *hd_data, isa_isdn_t *ii) - { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.56/src/hd/braille.c new/hwinfo-13.57/src/hd/braille.c --- old/hwinfo-13.56/src/hd/braille.c 2007-04-20 15:35:50.000000000 +0200 +++ new/hwinfo-13.57/src/hd/braille.c 2007-09-25 12:36:58.000000000 +0200 @@ -67,7 +67,7 @@ PROGRESS(1, cnt, "fhp_old"); *vend = MAKE_ID(TAG_SPECIAL, 0x5002); *dev = do_fhp(hd_data, hd->unix_dev_name, B19200, cnt); - if(!dev) { + if(!*dev) { PROGRESS(1, cnt, "fhp_el"); *dev = do_fhp(hd_data, hd->unix_dev_name, B38400, cnt); } @@ -345,12 +345,12 @@ ) ) { /* Pause to let them take effect */ - usleep(500); + usleep(12000); PROGRESS(3, cnt, "ht init ok"); write(fd, &code, 1); /* reset brl */ - usleep(5000); /* wait for reset */ + usleep(12000); /* wait for reset */ PROGRESS(4, cnt, "ht write ok"); @@ -360,7 +360,7 @@ PROGRESS(5, cnt, "ht read done"); if(buf[0] == 0xfe) { /* resetok now read id */ - usleep(5000); + usleep(12000); read(fd, buf + 1, 1); i = 2; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.56/src/hd/pci.c new/hwinfo-13.57/src/hd/pci.c --- old/hwinfo-13.56/src/hd/pci.c 2007-09-03 16:57:53.000000000 +0200 +++ new/hwinfo-13.57/src/hd/pci.c 2007-09-25 12:51:45.000000000 +0200 @@ -815,8 +815,8 @@ platform_type = canon_str(s, strlen(s)); ADD2LOG(" type = \"%s\"\n", platform_type); if( - !mv643xx_eth_seen++ && - !strcmp(platform_type, "mv643xx_eth") + !strcmp(platform_type, "mv643xx_eth") && + !mv643xx_eth_seen++ ) { add_mv643xx_eth(hd_data, platform_type); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.56/VERSION new/hwinfo-13.57/VERSION --- old/hwinfo-13.56/VERSION 2007-09-24 15:47:52.000000000 +0200 +++ new/hwinfo-13.57/VERSION 2007-09-25 12:37:20.000000000 +0200 @@ -1 +1 @@ -13.56 +13.57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org