Hello community, here is the log from the commit of package hwinfo checked in at Fri Aug 3 21:19:33 CEST 2007. -------- --- hwinfo/hwinfo.changes 2007-07-25 14:22:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/hwinfo/hwinfo.changes 2007-07-30 18:42:20.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Jul 30 18:42:14 CEST 2007 - snwint@suse.de + +- olh: add ppc sound card (#295614) + +------------------------------------------------------------------- +Mon Jul 30 12:49:02 CEST 2007 - snwint@suse.de + +- ps3: new disk & cdrom code (#294789, #295097) + +------------------------------------------------------------------- Old: ---- hwinfo-13.39.tar.bz2 New: ---- hwinfo-13.41.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.Q17496/_old 2007-08-03 21:18:51.000000000 +0200 +++ /var/tmp/diff_new_pack.Q17496/_new 2007-08-03 21:18:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package hwinfo (Version 13.39) +# spec file for package hwinfo (Version 13.41) # # 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.39 +Version: 13.41 Release: 1 -Source: hwinfo-13.39.tar.bz2 +Source: hwinfo-13.41.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -89,6 +89,10 @@ %doc doc/libhd/html %changelog +* Mon Jul 30 2007 - snwint@suse.de +- olh: add ppc sound card (#295614) +* Mon Jul 30 2007 - snwint@suse.de +- ps3: new disk & cdrom code (#294789, #295097) * Wed Jul 25 2007 - snwint@suse.de - more wlan drivers (#291131) - fixed framebuffer color depth calculation (#294334) ++++++ hwinfo-13.39.tar.bz2 -> hwinfo-13.41.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.39/Changelog new/hwinfo-13.41/Changelog --- old/hwinfo-13.39/Changelog 2007-07-25 14:21:09.000000000 +0200 +++ new/hwinfo-13.41/Changelog 2007-07-30 18:36:22.000000000 +0200 @@ -1,3 +1,9 @@ +30/7/2007: v13.41 + - olh: add ppc sound card (#295614) + +30/7/2007: v13.40 + - ps3: new disk & cdrom code (#294789, #295097) + 25/7/2007: v13.39 - more wlan drivers (#291131) - fixed framebuffer color depth calculation (#294334) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.39/src/hd/pci.c new/hwinfo-13.41/src/hd/pci.c --- old/hwinfo-13.39/src/hd/pci.c 2007-05-14 16:09:07.000000000 +0200 +++ new/hwinfo-13.41/src/hd/pci.c 2007-07-30 12:46:28.000000000 +0200 @@ -741,8 +741,10 @@ void hd_read_platform(hd_data_t *hd_data) { char *s, *platform_type; +#if 0 int scsi_cnt = 0; hd_t *hd; +#endif str_list_t *sf_bus, *sf_bus_e; char *sf_dev; @@ -769,6 +771,7 @@ ADD2LOG(" type = "%s"\n", platform_type); } +#if 0 if( platform_type && !strcmp(platform_type, "ps3_storage") ) { @@ -790,6 +793,7 @@ s = hd_sysfs_find_driver(hd_data, hd->sysfs_id, 1); if(s) add_str_list(&hd->drivers, s); } +#endif platform_type = free_mem(platform_type); @@ -808,6 +812,7 @@ { char *s, *ps3_name; int eth_cnt = 0; + int scsi_cnt = 0; hd_t *hd; str_list_t *sf_bus, *sf_bus_e; char *sf_dev; @@ -860,6 +865,46 @@ if(s) add_str_list(&hd->drivers, s); } + if ( ps3_name && !strcmp(ps3_name, "ps3:7")) { + hd = add_hd_entry(hd_data, __LINE__, 0); + hd->bus.id = bus_ps3_system_bus; + + hd->vendor.id = MAKE_ID(TAG_PCI, 0x104d); /* Sony */ + + hd->base_class.id = bc_storage; + hd->sub_class.id = sc_sto_other; /* cdrom */ + hd->slot = scsi_cnt++; + hd->device.id = MAKE_ID(TAG_SPECIAL, 0x1001); /* PS3_DEV_TYPE_STOR_ROM */ + str_printf(&hd->device.name, 0, "PS3 CDROM"); + + hd->modalias = new_str(ps3_name); + + hd->sysfs_id = new_str(hd_sysfs_id(sf_dev)); + hd->sysfs_bus_id = new_str(sf_bus_e->str); + s = hd_sysfs_find_driver(hd_data, hd->sysfs_id, 1); + if(s) add_str_list(&hd->drivers, s); + + } + if ( ps3_name && !strcmp(ps3_name, "ps3:6")) { + hd = add_hd_entry(hd_data, __LINE__, 0); + hd->bus.id = bus_ps3_system_bus; + + hd->vendor.id = MAKE_ID(TAG_PCI, 0x104d); /* Sony */ + + hd->base_class.id = bc_storage; + hd->sub_class.id = sc_sto_other; + hd->slot = scsi_cnt++; + hd->device.id = MAKE_ID(TAG_SPECIAL, 0x1002); /* PS3_DEV_TYPE_STOR_DISK */ + str_printf(&hd->device.name, 0, "PS3 Disk"); + + hd->modalias = new_str(ps3_name); + + hd->sysfs_id = new_str(hd_sysfs_id(sf_dev)); + hd->sysfs_bus_id = new_str(sf_bus_e->str); + s = hd_sysfs_find_driver(hd_data, hd->sysfs_id, 1); + if(s) add_str_list(&hd->drivers, s); + + } ps3_name = free_mem(ps3_name); free_mem(sf_dev); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.39/src/hd/prom.c new/hwinfo-13.41/src/hd/prom.c --- old/hwinfo-13.39/src/hd/prom.c 2007-02-20 13:04:10.000000000 +0100 +++ new/hwinfo-13.41/src/hd/prom.c 2007-07-30 18:35:37.000000000 +0200 @@ -1,3 +1,4 @@ +#define _GNU_SOURCE #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -34,6 +35,7 @@ static void dump_devtree_data(hd_data_t *hd_data); static unsigned veth_cnt, vscsi_cnt; +static unsigned snd_aoa_layout_id; int detect_smp_prom(hd_data_t *hd_data) { @@ -49,10 +51,24 @@ return cpus > 1 ? cpus : 0; } +static void prom_add_pmac_devices(hd_data_t *hd_data) +{ + hd_t *hd; + hd = add_hd_entry(hd_data, __LINE__, 0); + hd->bus.id = bus_none; + hd->base_class.id = bc_multimedia; + hd->sub_class.id = sc_multi_audio; + hd->vendor.id = MAKE_ID(TAG_SPECIAL, 0x401); + if (snd_aoa_layout_id) + hd->device.id = MAKE_ID(TAG_SPECIAL, 0x0015); + else + hd->device.id = MAKE_ID(TAG_SPECIAL, 0x0010); + +} void hd_scan_prom(hd_data_t *hd_data) { hd_t *hd; - unsigned char buf[16]; + unsigned char buf[42]; FILE *f; prom_info_t *pt; @@ -91,6 +107,13 @@ fclose(f); } + if((f = fopen(PROC_PROM "/compatible", "r"))) { + if(fread(buf, 1, sizeof(buf), f) > 2) { + if(memmem(buf, sizeof(buf),"MacRISC", 7)) + prom_add_pmac_devices(hd_data); + } + fclose(f); + } } @@ -182,6 +205,8 @@ if((dir = opendir(path))) { while((de = readdir(dir))) { if(!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) continue; + if(!strcmp(de->d_name, "layout-id")) + snd_aoa_layout_id = 1; s = NULL; str_printf(&s, 0, "%s/%s", path, de->d_name); if(!lstat(s, &sbuf)) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.39/src/ids/src/sound new/hwinfo-13.41/src/ids/src/sound --- old/hwinfo-13.39/src/ids/src/sound 2005-09-05 15:38:16.000000000 +0200 +++ new/hwinfo-13.41/src/ids/src/sound 2007-07-30 18:35:37.000000000 +0200 @@ -368,6 +368,11 @@ +driver.module.modprobe snd-powermac # ppc audio + vendor.id special 0x0401 +&device.id special 0x0015 ++driver.module.modprobe snd-aoa + +# ppc audio vendor.id special 0x0402 &device.id special 0x0014 +driver.module.modprobe cs4232 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.39/VERSION new/hwinfo-13.41/VERSION --- old/hwinfo-13.39/VERSION 2007-07-24 11:08:18.000000000 +0200 +++ new/hwinfo-13.41/VERSION 2007-07-30 18:35:42.000000000 +0200 @@ -1 +1 @@ -13.39 +13.41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org