Hello community,
here is the log from the commit of package hwinfo for openSUSE:Factory
checked in at Wed Mar 17 16:54:24 CET 2010.
--------
--- hwinfo/hwinfo.changes 2010-03-15 16:31:46.000000000 +0100
+++ hwinfo/hwinfo.changes 2010-03-17 15:27:42.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Mar 17 15:26:07 CET 2010 - snwint@suse.de
+
+- remove hal dependency
+- removed VERSION
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
hwinfo-16.13.tar.bz2
New:
----
hwinfo-17.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hwinfo.spec ++++++
--- /var/tmp/diff_new_pack.RJbDAm/_old 2010-03-17 16:53:41.000000000 +0100
+++ /var/tmp/diff_new_pack.RJbDAm/_new 2010-03-17 16:53:41.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package hwinfo (Version 16.13)
+# spec file for package hwinfo (Version 17.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,7 +19,7 @@
Name: hwinfo
-BuildRequires: doxygen flex hal-devel perl-XML-Parser perl-XML-Writer udev
+BuildRequires: doxygen flex perl-XML-Parser perl-XML-Writer udev
%ifarch %ix86 x86_64
BuildRequires: libx86emu-devel
%endif
@@ -27,13 +27,12 @@
Group: Hardware/Other
Provides: libhd
Obsoletes: libhd
-Requires: dbus-1 >= 0.34 hal >= 0.5.2
-PreReq: /sbin/ldconfig %insserv_prereq %fillup_prereq
+PreReq: /sbin/ldconfig
AutoReqProv: on
Summary: Hardware Library
-Version: 16.13
+Version: 17.0
Release: 1
-Source: hwinfo-16.13.tar.bz2
+Source: hwinfo-17.0.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
++++++ hwinfo-16.13.tar.bz2 -> hwinfo-17.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-16.13/Makefile new/hwinfo-17.0/Makefile
--- old/hwinfo-16.13/Makefile 2010-03-15 16:23:53.000000000 +0100
+++ new/hwinfo-17.0/Makefile 2010-03-16 15:50:21.000000000 +0100
@@ -5,10 +5,10 @@
LIBDIR = /usr/lib
ULIBDIR = $(LIBDIR)
LIBS = -lhd
-SLIBS = -lhd -ldbus-1 -lhal
-TLIBS = -lhd_tiny -ldbus-1 -lhal
-SO_LIBS = -ldbus-1 -lhal
-TSO_LIBS = -ldbus-1 -lhal
+SLIBS = -lhd
+TLIBS = -lhd_tiny
+SO_LIBS =
+TSO_LIBS =
export SO_LIBS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-16.13/VERSION new/hwinfo-17.0/VERSION
--- old/hwinfo-16.13/VERSION 2010-03-15 16:31:15.000000000 +0100
+++ new/hwinfo-17.0/VERSION 2010-03-17 15:26:01.000000000 +0100
@@ -1 +1 @@
-16.13
+17.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-16.13/changelog new/hwinfo-17.0/changelog
--- old/hwinfo-16.13/changelog 2010-03-15 16:31:16.000000000 +0100
+++ new/hwinfo-17.0/changelog 2010-03-17 15:26:02.000000000 +0100
@@ -1,4 +1,8 @@
-2010-03-15: HEAD
+2010-03-17: 17.0
+ - remove hal dependency
+ - removed VERSION
+
+2010-03-15: 16.13
- fix memory size detection (bnc #588028)
- create VERSION and changelog from git repo
- fix compile on non-suse systems
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-16.13/src/hd/block.c new/hwinfo-17.0/src/hd/block.c
--- old/hwinfo-16.13/src/hd/block.c 2010-03-15 16:23:53.000000000 +0100
+++ new/hwinfo-17.0/src/hd/block.c 2010-03-17 14:57:01.000000000 +0100
@@ -9,12 +9,14 @@
#include
#include
#include
+#include
#include
#include "hd.h"
#include "hd_int.h"
#include "hddb.h"
#include "block.h"
+#include "dvd.h"
/**
* @defgroup BLOCKint Block devices
@@ -423,6 +425,7 @@
void add_cdrom_info(hd_data_t *hd_data, hd_t *hd)
{
cdrom_info_t *ci, **prev;
+ int fd, caps, caps2;
hd->detail = free_hd_detail(hd->detail);
hd->detail = new_mem(sizeof *hd->detail);
@@ -438,42 +441,52 @@
}
if((ci = hd->detail->cdrom.data)) {
- /* update prog_if: cdr, cdrw, ... */
- if(
- /* ###### FIXME: dosn't work anyway: ide-scsi doesn't support sysfs */
- hd->bus.id == bus_scsi &&
- !search_str_list(hd->drivers, "ide-scsi") /* could be ide, though */
- ) {
- /* scsi devs lie */
- if(ci->dvd && (ci->cdrw || ci->dvdr || ci->dvdram)) {
- ci->dvd = ci->dvdr = ci->dvdram = 0;
- }
- ci->dvdr = ci->dvdram = 0;
- ci->cdr = ci->cdrw = 0;
- if(hd->prog_if.id == pif_cdr) ci->cdr = 1;
- }
-
- /* trust ide info */
- if(ci->dvd) {
- hd->is.dvd = 1;
- hd->prog_if.id = pif_dvd;
- }
- if(ci->cdr) {
- hd->is.cdr = 1;
- hd->prog_if.id = pif_cdr;
- }
- if(ci->cdrw) {
- hd->is.cdrw = 1;
- hd->prog_if.id = pif_cdrw;
- }
- if(ci->dvdr) {
- hd->is.dvdr = 1;
- hd->prog_if.id = pif_dvdr;
- }
- if(ci->dvdram) {
- hd->is.dvdram = 1;
- hd->prog_if.id = pif_dvdram;
+ fd = open(hd->unix_dev_name, O_RDONLY | O_NONBLOCK);
+ caps = caps2 = 0;
+ if(fd >= 0) {
+ caps = ioctl(fd, CDROM_GET_CAPABILITY, 0);
+ ADD2LOG(" cdrom caps(%s): 0x%x\n", hd->unix_dev_name, caps);
+ if(caps >= 0) {
+ if(caps & CDC_CD_R) hd->is.cdr = 1;
+ if(caps & CDC_CD_RW) hd->is.cdrw = 1;
+ if(caps & CDC_DVD_R) hd->is.dvdr = 1;
+ if(caps & CDC_DVD_RAM) hd->is.dvdram = 1;
+ if(caps & CDC_MO_DRIVE) hd->is.mo = 1;
+ if(caps & CDC_MRW) hd->is.mrw = 1;
+ if(caps & CDC_MRW_W) hd->is.mrww = 1;
+ if(caps & CDC_DVD) {
+ hd->is.dvd = 1;
+ caps2 = get_dvd_profile(fd);
+ ADD2LOG(" dvd caps(%s): 0x%x\n", hd->unix_dev_name, caps2);
+ if(caps2 & DRIVE_CDROM_CAPS_DVDRW) hd->is.dvdrw = 1;
+ if(caps2 & DRIVE_CDROM_CAPS_DVDRDL) hd->is.dvdrdl = 1;
+ if(caps2 & DRIVE_CDROM_CAPS_DVDPLUSR) hd->is.dvdpr = 1;
+ if(caps2 & DRIVE_CDROM_CAPS_DVDPLUSRW) hd->is.dvdprw = 1;
+ if(caps2 & DRIVE_CDROM_CAPS_DVDPLUSRWDL) hd->is.dvdprwdl = 1;
+ if(caps2 & DRIVE_CDROM_CAPS_DVDPLUSRDL) hd->is.dvdprdl = 1;
+ if(caps2 & DRIVE_CDROM_CAPS_BDROM) hd->is.bd = 1;
+ if(caps2 & DRIVE_CDROM_CAPS_BDR) hd->is.bdr = 1;
+ if(caps2 & DRIVE_CDROM_CAPS_BDRE) hd->is.bdre = 1;
+ if(caps2 & DRIVE_CDROM_CAPS_HDDVDROM) hd->is.hd = 1;
+ if(caps2 & DRIVE_CDROM_CAPS_HDDVDR) hd->is.hdr = 1;
+ if(caps2 & DRIVE_CDROM_CAPS_HDDVDRW) hd->is.hdrw = 1;
+ }
+ }
+ close(fd);
+ if(caps <= 0) {
+ if(ci->cdr) hd->is.cdr = 1;
+ if(ci->cdrw) hd->is.cdrw = 1;
+ if(ci->dvd) hd->is.dvd = 1;
+ if(ci->dvdr) hd->is.dvdr = 1;
+ if(ci->dvdram) hd->is.dvdram = 1;
+ }
}
+
+ if(hd->is.dvd) hd->prog_if.id = pif_dvd;
+ if(hd->is.cdr) hd->prog_if.id = pif_cdr;
+ if(hd->is.cdrw) hd->prog_if.id = pif_cdrw;
+ if(hd->is.dvdr) hd->prog_if.id = pif_dvdr;
+ if(hd->is.dvdram) hd->prog_if.id = pif_dvdram;
}
if(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-16.13/src/hd/dvd.c new/hwinfo-17.0/src/hd/dvd.c
--- old/hwinfo-16.13/src/hd/dvd.c 1970-01-01 01:00:00.000000000 +0100
+++ new/hwinfo-17.0/src/hd/dvd.c 2010-03-17 12:51:38.000000000 +0100
@@ -0,0 +1,299 @@
+/*
+ * taken from HAL 0.5.14
+ * http://www.freedesktop.org/Software/hal
+ *
+ * Originally part of dvd+rw-tools by Andy Polyakov
+ * http://fy.chalmers.se/~appro/linux/DVD+RW/
+ */
+
+#define CREAM_ON_ERRNO(s) do { \
+ switch ((s)[2]&0x0F) \
+ { case 2: if ((s)[12]==4) errno=EAGAIN; break; \
+ case 5: errno=EINVAL; \
+ if ((s)[13]==0) \
+ { if ((s)[12]==0x21) errno=ENOSPC; \
+ else if ((s)[12]==0x20) errno=ENODEV; \
+ } \
+ break; \
+ } \
+} while(0)
+#define ERRCODE(s) ((((s)[2]&0x0F)<<16)|((s)[12]<<8)|((s)[13]))
+#define SK(errcode) (((errcode)>>16)&0xF)
+#define ASC(errcode) (((errcode)>>8)&0xFF)
+#define ASCQ(errcode) ((errcode)&0xFF)
+
+#ifndef _LARGEFILE_SOURCE
+#define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
+#define _LARGEFILE64_SOURCE
+#endif
+#ifndef _FILE_OFFSET_BITS
+#define _FILE_OFFSET_BITS 64
+#endif
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "dvd.h"
+
+#if !defined(SG_FLAG_LUN_INHIBIT)
+# if defined(SG_FLAG_UNUSED_LUN_INHIBIT)
+# define SG_FLAG_LUN_INHIBIT SG_FLAG_UNUSED_LUN_INHIBIT
+# else
+# define SG_FLAG_LUN_INHIBIT 0
+# endif
+#endif
+
+typedef enum {
+ NONE = CGC_DATA_NONE, // 3
+ READ = CGC_DATA_READ, // 2
+ WRITE = CGC_DATA_WRITE // 1
+} Direction;
+
+typedef struct ScsiCommand ScsiCommand;
+
+struct ScsiCommand {
+ int fd;
+ int autoclose;
+ char *filename;
+ struct cdrom_generic_command cgc;
+ union {
+ struct request_sense s;
+ unsigned char u[18];
+ } _sense;
+ struct sg_io_hdr sg_io;
+};
+
+#define DIRECTION(i) (Dir_xlate[i]);
+
+/* 1,CGC_DATA_WRITE
+ * 2,CGC_DATA_READ
+ * 3,CGC_DATA_NONE
+ */
+const int Dir_xlate[4] = {
+ 0, // implementation-dependent...
+ SG_DXFER_TO_DEV, // 1,CGC_DATA_WRITE
+ SG_DXFER_FROM_DEV, // 2,CGC_DATA_READ
+ SG_DXFER_NONE // 3,CGC_DATA_NONE
+};
+
+static ScsiCommand *
+scsi_command_new (void)
+{
+ ScsiCommand *cmd;
+
+ cmd = (ScsiCommand *) malloc (sizeof (ScsiCommand));
+ memset (cmd, 0, sizeof (ScsiCommand));
+ cmd->fd = -1;
+ cmd->filename = NULL;
+ cmd->autoclose = 1;
+
+ return cmd;
+}
+
+static ScsiCommand *
+scsi_command_new_from_fd (int f)
+{
+ ScsiCommand *cmd;
+
+ cmd = scsi_command_new ();
+ cmd->fd = f;
+cmd->autoclose = 0;
+
+ return cmd;
+}
+
+static void
+scsi_command_free (ScsiCommand * cmd)
+{
+ if (cmd->fd >= 0 && cmd->autoclose) {
+ close (cmd->fd);
+ cmd->fd = -1;
+ }
+ if (cmd->filename) {
+ free (cmd->filename);
+ cmd->filename = NULL;
+ }
+
+ free (cmd);
+}
+
+static int
+scsi_command_transport (ScsiCommand * cmd, Direction dir, void *buf,
+ size_t sz)
+{
+ int ret = 0;
+
+ cmd->sg_io.dxferp = buf;
+ cmd->sg_io.dxfer_len = sz;
+ cmd->sg_io.dxfer_direction = DIRECTION (dir);
+
+ if (ioctl (cmd->fd, SG_IO, &cmd->sg_io))
+ return -1;
+
+ if ((cmd->sg_io.info & SG_INFO_OK_MASK) != SG_INFO_OK) {
+ errno = EIO;
+ ret = -1;
+ if (cmd->sg_io.masked_status & CHECK_CONDITION) {
+ CREAM_ON_ERRNO ((unsigned char*)cmd->sg_io.sbp);
+ ret = ERRCODE ((unsigned char*)cmd->sg_io.sbp);
+ if (ret == 0)
+ ret = -1;
+ }
+ }
+
+ return ret;
+}
+
+static void
+scsi_command_init (ScsiCommand * cmd, size_t i, int arg)
+{
+ if (i == 0) {
+ memset (&cmd->cgc, 0, sizeof (cmd->cgc));
+ memset (&cmd->_sense, 0, sizeof (cmd->_sense));
+ cmd->cgc.quiet = 1;
+ cmd->cgc.sense = &cmd->_sense.s;
+ memset (&cmd->sg_io, 0, sizeof (cmd->sg_io));
+ cmd->sg_io.interface_id = 'S';
+ cmd->sg_io.mx_sb_len = sizeof (cmd->_sense);
+ cmd->sg_io.cmdp = cmd->cgc.cmd;
+ cmd->sg_io.sbp = cmd->_sense.u;
+ cmd->sg_io.flags = SG_FLAG_LUN_INHIBIT | SG_FLAG_DIRECT_IO;
+ }
+ cmd->sg_io.cmd_len = i + 1;
+ cmd->cgc.cmd[i] = arg;
+}
+
+int
+get_dvd_profile(int fd)
+{
+ ScsiCommand *cmd;
+ int retval = 0;
+ unsigned char page[20];
+ unsigned char *list;
+ int i, len;
+
+ cmd = scsi_command_new_from_fd (fd);
+
+ scsi_command_init (cmd, 0, 0x46);
+ scsi_command_init (cmd, 1, 2);
+ scsi_command_init (cmd, 8, 8);
+ scsi_command_init (cmd, 9, 0);
+ if (scsi_command_transport (cmd, READ, page, 8)) {
+ /* GET CONFIGURATION failed */
+ scsi_command_free (cmd);
+ return -1;
+ }
+
+ /* See if it's 2 gen drive by checking if DVD+R profile is an option */
+ len = 4 + (page[0] << 24 | page[1] << 16 | page[2] << 8 | page[3]);
+ if (len > 264) {
+ scsi_command_free (cmd);
+ /* insane profile list length */
+ return -1;
+ }
+
+ list = (unsigned char *) malloc (len);
+
+ scsi_command_init (cmd, 0, 0x46);
+ scsi_command_init (cmd, 1, 2);
+ scsi_command_init (cmd, 7, len >> 8);
+ scsi_command_init (cmd, 8, len);
+ scsi_command_init (cmd, 9, 0);
+ if (scsi_command_transport (cmd, READ, list, len)) {
+ /* GET CONFIGURATION failed */
+ scsi_command_free (cmd);
+ free (list);
+ return -1;
+ }
+
+ for (i = 12; i < list[11]; i += 4) {
+ int profile = (list[i] << 8 | list[i + 1]);
+ /* 0x13: DVD-RW Restricted Overwrite
+ * 0x14: DVD-RW Sequential
+ * 0x15: DVD-R Dual Layer Sequential
+ * 0x16: DVD-R Dual Layer Jump
+ * 0x1A: DVD+RW
+ * 0x1B: DVD+R
+ * 0x2A: DVD+RW DL
+ * 0x2B: DVD+R DL
+ * 0x40: BD-ROM
+ * 0x41: BD-R SRM
+ * 0x42: BR-R RRM
+ * 0x43: BD-RE
+ * 0x50: HD DVD-ROM
+ * 0x51: HD DVD-R
+ * 0x52: HD DVD-Rewritable
+ */
+
+ switch (profile) {
+ case 0x13:
+ case 0x14:
+ retval |= DRIVE_CDROM_CAPS_DVDRW;
+ break;
+ case 0x15:
+ case 0x16:
+ retval |= DRIVE_CDROM_CAPS_DVDRDL;
+ break;
+ case 0x1B:
+ retval |= DRIVE_CDROM_CAPS_DVDPLUSR;
+ break;
+ case 0x1A:
+ retval |= DRIVE_CDROM_CAPS_DVDPLUSRW;
+ break;
+ case 0x2A:
+ retval |= DRIVE_CDROM_CAPS_DVDPLUSRWDL;
+ break;
+ case 0x2B:
+ retval |= DRIVE_CDROM_CAPS_DVDPLUSRDL;
+ break;
+ case 0x40:
+ retval |= DRIVE_CDROM_CAPS_BDROM;
+ break;
+ case 0x41:
+ case 0x42:
+ retval |= DRIVE_CDROM_CAPS_BDR;
+ break;
+ case 0x43:
+ retval |= DRIVE_CDROM_CAPS_BDRE;
+ break;
+ case 0x50:
+ retval |= DRIVE_CDROM_CAPS_HDDVDROM;
+ break;
+ case 0x51:
+ retval |= DRIVE_CDROM_CAPS_HDDVDR;
+ break;
+ case 0x52:
+ retval |= DRIVE_CDROM_CAPS_HDDVDRW;
+ break;
+ default:
+ break;
+ }
+ }
+
+ scsi_command_free (cmd);
+ free (list);
+
+ return retval;
+
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-16.13/src/hd/dvd.h new/hwinfo-17.0/src/hd/dvd.h
--- old/hwinfo-16.13/src/hd/dvd.h 1970-01-01 01:00:00.000000000 +0100
+++ new/hwinfo-17.0/src/hd/dvd.h 2010-03-17 12:51:48.000000000 +0100
@@ -0,0 +1,19 @@
+/*
+ * taken from HAL 0.5.14
+ * http://www.freedesktop.org/Software/hal
+ */
+
+#define DRIVE_CDROM_CAPS_DVDRW 1
+#define DRIVE_CDROM_CAPS_DVDRDL 2
+#define DRIVE_CDROM_CAPS_DVDPLUSR 4
+#define DRIVE_CDROM_CAPS_DVDPLUSRW 8
+#define DRIVE_CDROM_CAPS_DVDPLUSRWDL 16
+#define DRIVE_CDROM_CAPS_DVDPLUSRDL 32
+#define DRIVE_CDROM_CAPS_BDROM 64
+#define DRIVE_CDROM_CAPS_BDR 128
+#define DRIVE_CDROM_CAPS_BDRE 256
+#define DRIVE_CDROM_CAPS_HDDVDROM 512
+#define DRIVE_CDROM_CAPS_HDDVDR 1024
+#define DRIVE_CDROM_CAPS_HDDVDRW 2048
+
+int get_dvd_profile(int fd);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-16.13/src/hd/hal.c new/hwinfo-17.0/src/hd/hal.c
--- old/hwinfo-16.13/src/hd/hal.c 2010-03-15 16:23:53.000000000 +0100
+++ new/hwinfo-17.0/src/hd/hal.c 2010-03-16 15:48:59.000000000 +0100
@@ -11,6 +11,10 @@
#include
#include
+// #define WITH_HAL 1
+
+#if WITH_HAL
+
#ifndef DBUS_API_SUBJECT_TO_CHANGE
#define DBUS_API_SUBJECT_TO_CHANGE 1
#endif
@@ -18,6 +22,8 @@
#include
#include
+#endif
+
#include "hd.h"
#include "hd_int.h"
#include "hal.h"
@@ -95,6 +101,7 @@
void read_hal(hd_data_t *hd_data)
{
+#if WITH_HAL
DBusError error;
DBusConnection *conn;
LibHalContext *hal_ctx;
@@ -220,6 +227,7 @@
dbus_connection_unref(conn);
dbus_error_free(&error);
+#endif /* WITH_HAL */
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-16.13/src/hd/hd.h new/hwinfo-17.0/src/hd/hd.h
--- old/hwinfo-16.13/src/hd/hd.h 2010-03-15 16:23:53.000000000 +0100
+++ new/hwinfo-17.0/src/hd/hd.h 2010-03-17 15:25:43.000000000 +0100
@@ -1614,7 +1614,6 @@
hal_prop_t *prop;
} hal_device_t;
-
/**
* resource types: see @ref RESOURCEpub
*/
@@ -2459,10 +2458,21 @@
unsigned dvd:1; /**< DVD */
unsigned dvdr:1; /**< DVD-R */
unsigned dvdrw:1; /**< DVD-RW */
+ unsigned dvdrdl:1; /**< DVD-R DL */
unsigned dvdpr:1; /**< DVD+R */
unsigned dvdprw:1; /**< DVD+RW */
- unsigned dvdprdl:1; /**< DVD+RDL */
+ unsigned dvdprdl:1; /**< DVD+R DL */
+ unsigned dvdprwdl:1; /**< DVD+RW DL */
+ unsigned bd:1; /**< BD */
+ unsigned bdr:1; /**< BD-R */
+ unsigned bdre:1; /**< BD-RE */
+ unsigned hd:1; /**< HD */
+ unsigned hdr:1; /**< HD-R */
+ unsigned hdrw:1; /**< HD-RW */
unsigned dvdram:1; /**< DVDRAM */
+ unsigned mo:1; /**< MO */
+ unsigned mrw:1; /**< MRW */
+ unsigned mrww:1; /**< MRW-W */
unsigned pppoe:1; /**< PPPOE modem connected */
unsigned wlan:1; /**< WLAN card */
unsigned with_acpi:1; /**< acpi works fine */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-16.13/src/hd/hd_int.h new/hwinfo-17.0/src/hd/hd_int.h
--- old/hwinfo-16.13/src/hd/hd_int.h 2010-03-15 16:23:53.000000000 +0100
+++ new/hwinfo-17.0/src/hd/hd_int.h 2010-03-16 15:45:58.000000000 +0100
@@ -202,10 +202,10 @@
char* get_sysfs_attr(const char* bus, const char* device, const char* attr);
char* get_sysfs_attr_by_path(const char* path, const char* attr);
-hal_device_t *hd_free_hal_devices(hal_device_t *dev);
void hd_pci_complete_data(hd_t *hd);
void hd_pci_read_data(hd_data_t *hd_data);
+hal_device_t *hd_free_hal_devices(hal_device_t *dev);
char *hd_hal_print_prop(hal_prop_t *prop);
void hal_invalidate(hal_prop_t *prop);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-16.13/src/hd/hdp.c new/hwinfo-17.0/src/hd/hdp.c
--- old/hwinfo-16.13/src/hd/hdp.c 2010-03-15 16:23:53.000000000 +0100
+++ new/hwinfo-17.0/src/hd/hdp.c 2010-03-17 15:15:34.000000000 +0100
@@ -522,10 +522,21 @@
if(h->is.dvd) dump_line0("%s DVD", i++ ? "," : "");
if(h->is.dvdr) dump_line0("%s DVD-R", i++ ? "," : "");
if(h->is.dvdrw) dump_line0("%s DVD-RW", i++ ? "," : "");
+ if(h->is.dvdrdl) dump_line0("%s DVD-R DL", i++ ? "," : "");
if(h->is.dvdpr) dump_line0("%s DVD+R", i++ ? "," : "");
if(h->is.dvdprw) dump_line0("%s DVD+RW", i++ ? "," : "");
- if(h->is.dvdprdl) dump_line0("%s DVD+DL", i++ ? "," : "");
- if(h->is.dvdram) dump_line0("%s DVDRAM", i++ ? "," : "");
+ if(h->is.dvdprdl) dump_line0("%s DVD+R DL", i++ ? "," : "");
+ if(h->is.dvdprwdl) dump_line0("%s DVD+RW DL", i++ ? "," : "");
+ if(h->is.bd) dump_line0("%s BD", i++ ? "," : "");
+ if(h->is.bdr) dump_line0("%s BD-R", i++ ? "," : "");
+ if(h->is.bdre) dump_line0("%s BD-RE", i++ ? "," : "");
+ if(h->is.hd) dump_line0("%s HD", i++ ? "," : "");
+ if(h->is.hdr) dump_line0("%s HD-R", i++ ? "," : "");
+ if(h->is.hdrw) dump_line0("%s HD-RW", i++ ? "," : "");
+ if(h->is.dvdram) dump_line0("%s DVD-RAM", i++ ? "," : "");
+ if(h->is.mo) dump_line0("%s MO", i++ ? "," : "");
+ if(h->is.mrw) dump_line0("%s MRW", i++ ? "," : "");
+ if(h->is.mrww) dump_line0("%s MRW-W", i++ ? "," : "");
if(h->is.pppoe) dump_line0("%s PPPOE", i++ ? "," : "");
if(h->is.wlan) dump_line0("%s WLAN", i++ ? "," : "");
if(h->is.hotpluggable) dump_line0("%s Hotpluggable", i++ ? "," : "");
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org