Mailinglist Archive: opensuse-commit (1421 mails)
| < Previous | Next > |
commit sax2
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 13 May 2008 12:46:35 +0200
- Message-id: <20080513104637.1DDEE67816D@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package sax2
checked in at Tue May 13 12:46:35 CEST 2008.
--------
--- sax2/sax2.changes 2008-05-09 12:25:24.000000000 +0200
+++ /mounts/work_src_done/STABLE/sax2/sax2.changes 2008-05-13
09:41:41.335557000 +0200
@@ -1,0 +2,10 @@
+Tue May 13 09:39:20 CEST 2008 - ms@xxxxxxx
+
+- added HD resolutions (720p/1080p) (bnc #389133)
+
+-------------------------------------------------------------------
+Mon May 12 12:47:42 CEST 2008 - ms@xxxxxxx
+
+- update hwinfo source
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sax2.spec ++++++
--- /var/tmp/diff_new_pack.H25522/_old 2008-05-13 12:46:11.000000000 +0200
+++ /var/tmp/diff_new_pack.H25522/_new 2008-05-13 12:46:11.000000000 +0200
@@ -40,7 +40,7 @@
PreReq: /bin/rm /bin/mkdir /usr/bin/chroot %fillup_prereq
%insserv_prereq
Summary: SuSE advanced X Window System-configuration
Version: 8.1
-Release: 421
+Release: 423
Group: System/X11/Utilities
License: GPL v2 or later
Source: sax2.tar.bz2
@@ -468,6 +468,10 @@
%endif
%changelog
+* Tue May 13 2008 ms@xxxxxxx
+- added HD resolutions (720p/1080p) (bnc #389133)
+* Mon May 12 2008 ms@xxxxxxx
+- update hwinfo source
* Fri May 09 2008 ms@xxxxxxx
- allow labels to wrap the text (bnc #354386)
* Fri May 09 2008 ms@xxxxxxx
++++++ sax2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/sax/api/data/MonitorResolution
new/sax/api/data/MonitorResolution
--- old/sax/api/data/MonitorResolution 2008-04-08 11:29:39.000000000 +0200
+++ new/sax/api/data/MonitorResolution 2008-05-13 09:40:45.000000000 +0200
@@ -5,7 +5,7 @@
1024x768=1024x768 (XGA)
1152x864=1152x864 (XGA)
1280x600=1280x600
-1280x720=1280x720
+1280x720=1280x720 (720p)
1280x768=1280x768 (WXGA)
1280x800=1280x800 (WXGA)
1366x768=1366x768 (WXGA)
@@ -18,6 +18,7 @@
1600x1200=1600x1200 (UXGA)
1680x1050=1680x1050 (WSXGA+)
1900x1200=1900x1200
+1920x1080=1920x1080 (1080p)
1920x1200=1920x1200 (WUXGA)
1920x1440=1920x1440
2048x1536=2048x1536 (QXGA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/sax/svnbuild new/sax/svnbuild
--- old/sax/svnbuild 2008-05-09 12:27:40.000000000 +0200
+++ new/sax/svnbuild 2008-05-13 09:44:05.000000000 +0200
@@ -1 +1 @@
-1596
+1598
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/sax/sysp/lib/libhd/hd/braille.c
new/sax/sysp/lib/libhd/hd/braille.c
--- old/sax/sysp/lib/libhd/hd/braille.c 2008-02-05 17:38:54.000000000 +0100
+++ new/sax/sysp/lib/libhd/hd/braille.c 2008-05-12 12:56:49.000000000 +0200
@@ -4,6 +4,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <termios.h>
+#include <sys/ioctl.h>
#include "hd.h"
#include "hd_int.h"
@@ -21,6 +22,7 @@
static unsigned do_alva(hd_data_t *hd_data, char *dev_name, int cnt);
static unsigned do_fhp(hd_data_t *hd_data, char *dev_name, unsigned baud, int
cnt);
+static unsigned do_fhp_new(hd_data_t *hd_data, char *dev_name, int cnt);
static unsigned do_ht(hd_data_t *hd_data, char *dev_name, int cnt);
static unsigned do_baum(hd_data_t *hd_data, char *dev_name, int cnt);
@@ -85,6 +87,12 @@
*dev = do_baum(hd_data, hd->unix_dev_name, cnt);
}
+ if(!*dev && hd_probe_feature(hd_data, pr_braille_fhp)) {
+ PROGRESS(1, cnt, "fhp new");
+ *vend = MAKE_ID(TAG_SPECIAL, 0x5002);
+ *dev = do_fhp_new(hd_data, hd->unix_dev_name, cnt);
+ }
+
}
hd_fork_done(hd_data);
@@ -438,7 +446,7 @@
/* no input parity check, no XON/XOFF */
curtio.c_iflag &= ~(INPCK | ~IXOFF);
- curtio.c_cc[VTIME] = 1; /* 0.1s timeout between chars on input */
+ curtio.c_cc[VTIME] = 2; /* 0.1s timeout between chars on input */
curtio.c_cc[VMIN] = 0; /* no minimum input */
tcsetattr(fd, TCSAFLUSH, &curtio);
@@ -447,7 +455,7 @@
write(fd, device_id, sizeof device_id);
/* wait for response */
- usleep(100000);
+ usleep(250000);
PROGRESS(3, cnt, "baum write ok");
@@ -465,13 +473,111 @@
tcsetattr(fd, TCSAFLUSH, &oldtio);
close(fd);
- if(!strcmp(buf + 2, "Baum Vario40")) return 1;
- if(!strcmp(buf + 2, "Baum Vario80")) return 2;
+ if(!strcmp(buf + 2, "Baum Vario40")) return MAKE_ID(TAG_SPECIAL, 1);
+ if(!strcmp(buf + 2, "Baum Vario80")) return MAKE_ID(TAG_SPECIAL, 2);
return 0;
}
+unsigned do_fhp_new(hd_data_t *hd_data, char *dev_name, int cnt)
+{
+ int i, fd, status = 0;
+ unsigned id;
+ unsigned char retstr[50] = "";
+ unsigned char brlauto[] = { 2, 0x42, 0x50, 0x50, 3 };
+ struct termios oldtio, tiodata = { };
+
+ PROGRESS(2, cnt, "fhp2 open");
+
+ fd = open(dev_name, O_RDWR | O_NONBLOCK | O_NOCTTY);
+ if(fd < 0) return 0;
+
+ fcntl(fd, F_SETFL, 0); // remove O_NONBLOCK
+
+ tcgetattr(fd, &oldtio);
+
+ /* Set bps, and 8n1, enable reading */
+ tiodata.c_cflag = (CLOCAL | CREAD | CS8);
+ tiodata.c_iflag = IGNPAR;
+ tiodata.c_lflag = 0;
+ tiodata.c_cc[VMIN] = 0;
+ tiodata.c_cc[VTIME] = 0;
+
+ if(
+ cfsetispeed(&tiodata, B0) ||
+ cfsetospeed(&tiodata, B0) ||
+ tcsetattr(fd, TCSANOW, &tiodata) ||
+ tcflush(fd, TCIOFLUSH) ||
+ cfsetispeed(&tiodata, B57600) ||
+ cfsetospeed(&tiodata, B57600) ||
+ tcsetattr(fd, TCSANOW, &tiodata)
+ ) {
+ /* init error */
+
+ tcflush(fd, TCIOFLUSH);
+ tcsetattr(fd, TCSAFLUSH, &oldtio);
+ close(fd);
+
+ return 0;
+ }
+
+ tcflush(fd, TCIOFLUSH);
+ usleep(100 * 1000);
+
+ /* get status of inteface */
+ ioctl(fd, TIOCMGET, &status);
+
+ /* clear dtr-line */
+ status &= ~TIOCM_DTR;
+
+ /* set new status */
+ ioctl(fd, TIOCMSET, &status);
+
+ usleep(100 * 1000);
+
+ write(fd, brlauto, sizeof brlauto);
+
+ PROGRESS(3, cnt, "fhp2 write ok");
+
+ usleep(100 * 1000);
+
+ i = read(fd, retstr, 20);
+
+ PROGRESS(4, cnt, "fhp2 read done");
+
+ ADD2LOG("fhp2@%s[%d]: ", dev_name, i);
+ if(i > 0) hexdump(&hd_data->log, 1, i, retstr);
+ ADD2LOG("\n");
+
+ id = 0;
+
+ if(i == 10 && retstr[1] == 'J') {
+ id = retstr[3];
+
+ /* papenmeir new serial and usb device IDs */
+ switch(id) {
+ case 0x55:
+ case 0x57:
+ case 0x58:
+ id = MAKE_ID(TAG_SPECIAL, id);
+ break;
+
+ default:
+ ADD2LOG("unknown id %d\n", id);
+ id = 0;
+ }
+ }
+
+ /* reset serial lines */
+ tcflush(fd, TCIOFLUSH);
+ tcsetattr(fd, TCSAFLUSH, &oldtio);
+ close(fd);
+
+ return id;
+}
+
+
#endif /* !defined(LIBHD_TINY) && !defined(__sparc__) */
/** @} */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/sax/sysp/lib/libhd/hd/hd.h
new/sax/sysp/lib/libhd/hd/hd.h
--- old/sax/sysp/lib/libhd/hd/hd.h 2008-03-06 17:17:54.000000000 +0100
+++ new/sax/sysp/lib/libhd/hd/hd.h 2008-05-12 12:56:49.000000000 +0200
@@ -1044,8 +1044,8 @@
char *sysfs_id; /**< sysfs path */
char *sysfs_bus_id; /**< sysfs bus id */
char *modalias; /**< module alias */
- unsigned edid_len; /**< edid record length */
- unsigned char edid[0x80]; /**< edid record */
+ unsigned edid_len[4]; /**< edid record length
*/
+ unsigned char edid_data[4][0x80]; /**< edid record */
} pci_t;
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/sax/sysp/lib/libhd/hd/monitor.c
new/sax/sysp/lib/libhd/hd/monitor.c
--- old/sax/sysp/lib/libhd/hd/monitor.c 2007-08-24 10:36:59.000000000 +0200
+++ new/sax/sysp/lib/libhd/hd/monitor.c 2008-05-12 12:56:49.000000000 +0200
@@ -44,6 +44,7 @@
devtree_t *dt;
pci_t *pci;
int found;
+ unsigned u;
if(!hd_probe_feature(hd_data, pr_monitor)) return;
@@ -115,15 +116,18 @@
hd &&
hd->detail &&
hd->detail->type == hd_detail_pci &&
- (pci = hd->detail->pci.data) &&
- pci->edid_len >= 0x80 &&
- chk_edid_info(hd_data, pci->edid)
+ (pci = hd->detail->pci.data)
) {
- hd2 = add_hd_entry(hd_data, __LINE__, 0);
- hd2->base_class.id = bc_monitor;
- hd2->attached_to = hd->idx;
- add_edid_info(hd_data, hd2, pci->edid);
- found = 1;
+ for(u = 0; u < sizeof pci->edid_len / sizeof *pci->edid_len; u++) {
+ if(pci->edid_len[u] >= 0x80 && chk_edid_info(hd_data,
pci->edid_data[u])) {
+ hd2 = add_hd_entry(hd_data, __LINE__, 0);
+ hd2->base_class.id = bc_monitor;
+ hd2->slot = u;
+ hd2->attached_to = hd->idx;
+ add_edid_info(hd_data, hd2, pci->edid_data[u]);
+ found = 1;
+ }
+ }
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/sax/sysp/lib/libhd/hd/pci.c
new/sax/sysp/lib/libhd/hd/pci.c
--- old/sax/sysp/lib/libhd/hd/pci.c 2008-04-15 09:03:46.000000000 +0200
+++ new/sax/sysp/lib/libhd/hd/pci.c 2008-05-12 12:56:49.000000000 +0200
@@ -52,7 +52,7 @@
static void hd_read_xen(hd_data_t *hd_data);
static void hd_read_ps3_system_bus(hd_data_t *hd_data);
static void hd_read_vm(hd_data_t *hd_data);
-static void add_mv643xx_eth(hd_data_t *hd_data, char *platform_type);
+static void add_mv643xx_eth(hd_data_t *hd_data, char *entry, char
*platform_type);
static void hd_read_platform(hd_data_t *hd_data);
static void hd_read_of_platform(hd_data_t *hd_data);
static void add_xen_network(hd_data_t *hd_data);
@@ -252,21 +252,29 @@
close(fd);
}
- str_printf(&s, 0, "%s/edid1", sf_dev);
- if((fd = open(s, O_RDONLY)) != -1) {
- pci->edid_len = read(fd, pci->edid, sizeof pci->edid);
-
- ADD2LOG(" edid[%u]\n", pci->edid_len);
-
- if(pci->edid_len > 0) {
- for(i = 0; i < sizeof pci->edid; i += 0x10) {
- ADD2LOG(" ");
- hexdump(&hd_data->log, 1, 0x10, pci->edid + i);
- ADD2LOG("\n");
+ for(u = 0; u < sizeof pci->edid_len / sizeof *pci->edid_len; u++) {
+ str_printf(&s, 0, "%s/edid%u", sf_dev, u + 1);
+ if((fd = open(s, O_RDONLY)) != -1) {
+ pci->edid_len[u] = read(fd, pci->edid_data[u], sizeof
pci->edid_data[u]);
+
+ ADD2LOG(" edid%u[%u]\n", u + 1, pci->edid_len[u]);
+
+ if(pci->edid_len[u] > 0) {
+ for(i = 0; i < sizeof pci->edid_data[u]; i += 0x10) {
+ ADD2LOG(" ");
+ hexdump(&hd_data->log, 1, 0x10, pci->edid_data[u] + i);
+ ADD2LOG("\n");
+ }
+ }
+ else {
+ pci->edid_len[u] = 0;
}
- }
- close(fd);
+ close(fd);
+ }
+ else {
+ pci->edid_len[u] = 0;
+ }
}
s = free_mem(s);
@@ -761,28 +769,26 @@
/*
* Marvell Gigabit Ethernet in Pegasos2
*/
-void add_mv643xx_eth(hd_data_t *hd_data, char *platform_type)
+void add_mv643xx_eth(hd_data_t *hd_data, char *entry, char *platform_type)
{
hd_t *hd;
- char *sf_dev, *sf_dev_name;
+ char *sf_dev = NULL;
- /*
- * Actually there are two (.0 & .1), but only one seems to be used - so we
- * don't care.
- */
- sf_dev = "/sys/devices/platform/mv643xx_eth.0";
- sf_dev_name = "mv643xx_eth.0";
+ str_printf(&sf_dev, 0, "%s/%s", "/sys/devices/platform", entry);
+ ADD2LOG(" platform device: adding %s\n", entry);
hd = add_hd_entry(hd_data, __LINE__, 0);
hd->base_class.id = bc_network;
hd->sub_class.id = 0;
hd->sysfs_id = new_str(hd_sysfs_id(sf_dev));
- hd->sysfs_bus_id = new_str(sf_dev_name);
+ hd->sysfs_bus_id = new_str(entry);
hd->modalias = new_str(platform_type);
hd->vendor.id = MAKE_ID(TAG_PCI, 0x11ab);
- hd->device.id = MAKE_ID(TAG_PCI, 0x11ab);
+ hd->device.id = MAKE_ID(TAG_PCI, 0x6460);
+
+ free_mem(sf_dev);
}
@@ -792,8 +798,8 @@
void hd_read_platform(hd_data_t *hd_data)
{
char *s, *platform_type;
- str_list_t *sf_bus, *sf_bus_e;
- char *sf_dev;
+ str_list_t *sf_bus, *sf_bus_e, *sf_eth_dev = NULL;
+ char *sf_dev, *sf_eth_net;
int mv643xx_eth_seen = 0;
sf_bus = reverse_str_list(read_dir("/sys/bus/platform/devices", 'l'));
@@ -815,13 +821,20 @@
if((s = get_sysfs_attr_by_path(sf_dev, "modalias"))) {
platform_type = canon_str(s, strlen(s));
ADD2LOG(" type = \"%s\"\n", platform_type);
- if(
+ sf_eth_net = new_str(hd_read_sysfs_link(sf_dev, "net"));
+ sf_eth_dev = read_dir(sf_eth_net, 'd');
+ ADD2LOG(" platform device: sf_eth_net = %s sf_eth_dev = %p\n",
sf_eth_net, sf_eth_dev);
+ if (
+ /* there is 'mv643xx_eth.0', 'mv643xx_eth.1' and 'mv643xx_eth_shared.'
*/
+ sf_eth_dev && sf_eth_net &&
strstr(platform_type, "mv643xx_eth") &&
!mv643xx_eth_seen++
) {
- add_mv643xx_eth(hd_data, platform_type);
+ add_mv643xx_eth(hd_data, sf_bus_e->str, platform_type);
}
free_mem(platform_type);
+ free_mem(sf_eth_net);
+ free_str_list(sf_eth_dev);
}
free_mem(sf_dev);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/sax/sysp/lib/libhd/hd/usb.c
new/sax/sysp/lib/libhd/hd/usb.c
--- old/sax/sysp/lib/libhd/hd/usb.c 2008-03-03 17:46:46.000000000 +0100
+++ new/sax/sysp/lib/libhd/hd/usb.c 2008-05-12 12:56:49.000000000 +0200
@@ -393,6 +393,7 @@
if(sub == 1 && prot == 2) {
if(!(
(usb->vendor == 0x056a && usb->device == 0x0022) /* Wacom Tablet
*/
+ || (usb->vendor == 0x147a && usb->device == 0xe001) /* eDio USB
Multi Remote Controlle */
// || (usb->vendor == 0x08ca && usb->device == 0x0020) /*
AIPTEK APT-6000U tablet */
)) {
hd->base_class.id = bc_mouse;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/sax/sysp/lib/libhd/ids/src/braille
new/sax/sysp/lib/libhd/ids/src/braille
--- old/sax/sysp/lib/libhd/ids/src/braille 2008-02-05 17:39:55.000000000
+0100
+++ new/sax/sysp/lib/libhd/ids/src/braille 2008-05-12 12:56:48.000000000
+0200
@@ -86,6 +86,21 @@
+device.name el40p
+driver.any el40p
+ vendor.id special 0x5002
+&device.id special 0x0055
++device.name el40s
++driver.any el40s
+
+ vendor.id special 0x5002
+&device.id special 0x0057
++device.name el66s
++driver.any el66s
+
+ vendor.id special 0x5002
+&device.id special 0x0058
++device.name el80s
++driver.any el80s
+
vendor.id special 0x5003
+vendor.name Handy Tech
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/sax/sysp/lib/libhd/ids/src/x11.amd64
new/sax/sysp/lib/libhd/ids/src/x11.amd64
--- old/sax/sysp/lib/libhd/ids/src/x11.amd64 2008-02-05 17:39:56.000000000
+0100
+++ new/sax/sysp/lib/libhd/ids/src/x11.amd64 2008-05-12 12:56:48.000000000
+0200
@@ -2489,7 +2489,7 @@
vendor.id pci 0x10de
&device.id pci 0x0165
-+device.name 0x0165
++device.name Quadro NVS 285
+driver.xfree 4|nv
+driver.xfree 4|nvidia|3d
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/sax/sysp/lib/libhd/ids/src/x11.i386
new/sax/sysp/lib/libhd/ids/src/x11.i386
--- old/sax/sysp/lib/libhd/ids/src/x11.i386 2008-02-05 17:39:56.000000000
+0100
+++ new/sax/sysp/lib/libhd/ids/src/x11.i386 2008-05-12 12:56:48.000000000
+0200
@@ -2497,7 +2497,7 @@
vendor.id pci 0x10de
&device.id pci 0x0165
-+device.name 0x0165
++device.name Quadro NVS 285
+driver.xfree 4|nv
+driver.xfree 4|nvidia|3d
@@ -3536,6 +3536,11 @@
+device.name Quadro FX 3700
+driver.xfree 4|nv
+ vendor.id pci 0x10de
+&device.id pci 0x0622
++device.name GeForce 9600 GT
++driver.xfree 4|nv
+
vendor.id pci 0x10e0
+vendor.name Imstt
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/sax/sysp/lib/libhd/ids/src/x11.ia64
new/sax/sysp/lib/libhd/ids/src/x11.ia64
--- old/sax/sysp/lib/libhd/ids/src/x11.ia64 2008-02-05 17:39:56.000000000
+0100
+++ new/sax/sysp/lib/libhd/ids/src/x11.ia64 2008-05-12 12:56:48.000000000
+0200
@@ -2217,7 +2217,7 @@
vendor.id pci 0x10de
&device.id pci 0x0165
-+device.name 0x0165
++device.name Quadro NVS 285
+driver.xfree 4|nv
vendor.id pci 0x10de
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/sax/sysp/lib/libhd/ids/src/x11.ppc
new/sax/sysp/lib/libhd/ids/src/x11.ppc
--- old/sax/sysp/lib/libhd/ids/src/x11.ppc 2008-02-05 17:39:56.000000000
+0100
+++ new/sax/sysp/lib/libhd/ids/src/x11.ppc 2008-05-12 12:56:48.000000000
+0200
@@ -2128,7 +2128,7 @@
vendor.id pci 0x10de
&device.id pci 0x0165
-+device.name 0x0165
++device.name Quadro NVS 285
+driver.xfree 4|nv
vendor.id pci 0x10de
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/sax/sysp/lib/libhd/VERSION
new/sax/sysp/lib/libhd/VERSION
--- old/sax/sysp/lib/libhd/VERSION 2008-04-29 09:31:40.000000000 +0200
+++ new/sax/sysp/lib/libhd/VERSION 2008-05-12 12:56:50.000000000 +0200
@@ -1 +1 @@
-14.13
+14.16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |