Bug#165192: marked as done (rio500 usbfs support and cleanups)
Your message dated Sun, 31 Jul 2005 23:35:08 +0100
with message-id <20050731223508.GA31066@deprecation.cyrius.com>
and subject line Removed from Debian - unmaintained
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 17 Oct 2002 14:39:13 +0000
>From wg@malloc.de Thu Oct 17 09:39:11 2002
Return-path: <wg@malloc.de>
Received: from moutvdom.kundenserver.de [195.20.224.130]
by master.debian.org with esmtp (Exim 3.12 1 (Debian))
id 182Bnq-0003AI-00; Thu, 17 Oct 2002 09:39:10 -0500
Received: from [212.227.126.222] (helo=mrvdomng.kundenserver.de)
by moutvdom.kundenserver.de with esmtp (Exim 3.35 #1)
id 182Bnp-0003oI-00
for submit@bugs.debian.org; Thu, 17 Oct 2002 16:39:09 +0200
Received: from [138.245.179.2] (helo=mail.malloc.de)
by mrvdomng.kundenserver.de with esmtp (Exim 3.35 #1)
id 182Bno-0003WL-00
for submit@bugs.debian.org; Thu, 17 Oct 2002 16:39:08 +0200
To: submit@bugs.debian.org
Subject: rio500 usbfs support and cleanups
From: Wolfram Gloger <wg@malloc.de>
X-URL: http://www.malloc.de/
Message-Id: <E182Bno-0003WL-00@mrvdomng.kundenserver.de>
Date: Thu, 17 Oct 2002 16:39:08 +0200
Delivered-To: submit@bugs.debian.org
X-Spam-Status: No, hits=-2.2 required=5.0
tests=PATCH_UNIFIED_DIFF,SPAM_PHRASE_00_01,SUPERLONG_LINE
version=2.41
X-Spam-Level:
Package: rio500
Version: 0.8.1-2
Severity: wishlist
Hi,
I have re-activated usbfs support in rio500_0.8.1-2, using
libusb-0.1.6a. I actually prefer talking to the rio500 via usbfs
because it saves the special rio500 kernel module. (Any arguments
_against_ usbfs?)
I also fixed a major memory leak in rio_add_song (unfortunately it has
to be fixed twice because rio_add_song apparently doesn't use
librio500 completely yet).
Patch appended below; I've verified it doesn't break the build when
--with-usbdevfs isn't specified. The debian/rules diff is just for
demonstration purposes and should of course not be applied unless you
decide that usbfs support is superior. The patch should probably be
submitted upstream but I haven't found out how they want to be
contacted.
Regards,
Wolfram.
diff -ur rio500-0.8.1/debian/rules rio500-0.8.1-wg/debian/rules
--- rio500-0.8.1/debian/rules Wed Oct 16 23:30:14 2002
+++ rio500-0.8.1-wg/debian/rules Wed Oct 16 23:09:40 2002
@@ -12,7 +12,7 @@
configure: config.log
config.log:
dh_testdir
- ./configure --prefix=/usr --mandir=\$${prefix}/share/man
+ ./configure --with-usbdevfs --with-glib1 --prefix=/usr --mandir=\$${prefix}/share/man
build: configure build-stamp
build-stamp:
diff -ur rio500-0.8.1/librio500/Makefile.am rio500-0.8.1-wg/librio500/Makefile.am
--- rio500-0.8.1/librio500/Makefile.am Tue Feb 19 18:46:41 2002
+++ rio500-0.8.1-wg/librio500/Makefile.am Wed Oct 16 23:09:41 2002
@@ -11,14 +11,12 @@
INCLUDES = \
-Wall \
- -I/usr/src/linux/drivers/usb \
-DDEFAULT_PSF_FONT=\"$(DEFAULT_PSF_FONT)\" \
-DDEFAULT_FONT_PATH=\"$(DEFAULT_FONT_PATH)\" \
-DDEFAULT_FON_FONT=\"$(DEFAULT_FON_FONT)\" \
-DDEFAULT_DEV_PATH=\"$(DEFAULT_DEV_PATH)\" \
@GLIB_CFLAGS@ \
- $(USB_CFLAGS) \
- $(USB_LIBS)
+ $(USB_CFLAGS)
extra_build = libfon.h libpsf.h librio500.h librio500_api.h getopt.h \
rio500_usb.h rio500_usb.h i18n.h bmp2rioani.h
diff -ur rio500-0.8.1/librio500/Makefile.in rio500-0.8.1-wg/librio500/Makefile.in
--- rio500-0.8.1/librio500/Makefile.in Wed May 22 21:15:39 2002
+++ rio500-0.8.1-wg/librio500/Makefile.in Wed Oct 16 23:09:41 2002
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
@@ -118,7 +118,7 @@
DEFAULT_DEV_PATH = $(DEVICE_PATH)/$(DEVICE_ENTRY)
-INCLUDES = -Wall -I/usr/src/linux/drivers/usb -DDEFAULT_PSF_FONT=\"$(DEFAULT_PSF_FONT)\" -DDEFAULT_FONT_PATH=\"$(DEFAULT_FONT_PATH)\" -DDEFAULT_FON_FONT=\"$(DEFAULT_FON_FONT)\" -DDEFAULT_DEV_PATH=\"$(DEFAULT_DEV_PATH)\" @GLIB_CFLAGS@ $(USB_CFLAGS) $(USB_LIBS)
+INCLUDES = -Wall -DDEFAULT_PSF_FONT=\"$(DEFAULT_PSF_FONT)\" -DDEFAULT_FONT_PATH=\"$(DEFAULT_FONT_PATH)\" -DDEFAULT_FON_FONT=\"$(DEFAULT_FON_FONT)\" -DDEFAULT_DEV_PATH=\"$(DEFAULT_DEV_PATH)\" @GLIB_CFLAGS@ $(USB_CFLAGS)
extra_build = libfon.h libpsf.h librio500.h librio500_api.h getopt.h rio500_usb.h rio500_usb.h i18n.h bmp2rioani.h
@@ -301,7 +301,6 @@
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
-
info-am:
info: info-am
dvi-am:
diff -ur rio500-0.8.1/librio500/librio500-usbdevfs.c rio500-0.8.1-wg/librio500/librio500-usbdevfs.c
--- rio500-0.8.1/librio500/librio500-usbdevfs.c Sat Feb 9 21:58:22 2002
+++ rio500-0.8.1-wg/librio500/librio500-usbdevfs.c Wed Oct 16 23:09:41 2002
@@ -43,6 +43,7 @@
# endif
#endif
+#include "config.h"
#include "librio500.h"
#include <usb.h>
#include "libpsf.h"
diff -ur rio500-0.8.1/librio500/librio500_api.c rio500-0.8.1-wg/librio500/librio500_api.c
--- rio500-0.8.1/librio500/librio500_api.c Sun Feb 17 19:16:26 2002
+++ rio500-0.8.1-wg/librio500/librio500_api.c Wed Oct 16 23:09:41 2002
@@ -1,3 +1,5 @@
+#include "config.h"
+
#include <librio500_api.h>
#include <i18n.h>
@@ -10,8 +12,6 @@
#include <sys/stat.h>
#include <dirent.h>
-#include "config.h"
-
/* Local functions */
static void rio_api_open_l (Rio500 *rio);
static void rio_api_clear_folders_l (GList *folders);
@@ -51,7 +51,7 @@
#else
#define RIO_CHECK_INT(x, y) g_return_val_if_fail (x != NULL, RIO_INITCOMM); \
g_return_val_if_fail (x->rio_dev == NULL, y);
-#define RIO_CHECK_PTR(x, y) g_return_val_if_fail (x != NULL, RIO_INITCOMM); \
+#define RIO_CHECK_PTR(x, y) g_return_val_if_fail (x != NULL, NULL); \
g_return_val_if_fail (x->rio_dev == NULL, y);
#endif
@@ -127,7 +127,7 @@
if (rio->rio_dev > 0)
retval = TRUE;
#else
- if (rio->rio_dev != NULL)
+ /*if (rio->rio_dev != NULL)*/
retval = TRUE;
#endif
return retval;
@@ -187,6 +187,20 @@
return RIO_SUCCESS;
}
+unsigned long
+rio_get_card_number (Rio500 *rio)
+{
+ unsigned long rval;
+
+ if (!rio)
+ return -1;
+ start_comm (rio);
+
+ rval = query_card_count(rio->rio_dev);
+
+ end_comm (rio);
+ return rval;
+}
/* -------------------------------------------------------------------
NAME: rio_set_report_func
@@ -678,6 +692,7 @@
int rev;
gchar *tmp = NULL;
+ start_comm (rio);
rev = query_firmware_rev (rio->rio_dev);
*major = (rev >> 8);
*minor = (rev & 0xff);
@@ -689,6 +704,7 @@
*minor = g_strtod(tmp, NULL);
g_free(tmp);
}
+ end_comm (rio);
}
@@ -995,7 +1011,7 @@
return g_list_first (new_entry);
}
-int
+static int
write_song (Rio500 *rio, char *filename)
{
int input_file;
@@ -1005,8 +1021,6 @@
int num_chunks, song_location;
char message[255];
- block = (char *)malloc (0x80000);
-
i = 0;
input_file = open (filename, O_RDONLY);
if (input_file == -1)
@@ -1014,6 +1028,8 @@
size = file_size (filename);
+ block = (char *)malloc (0x80000);
+
num_blocks = size / 0x10000;
remainder = size % 0x10000;
@@ -1091,6 +1107,7 @@
send_command (rio->rio_dev, 0x42, 0, 0);
song_location = send_command (rio->rio_dev, 0x43, 0, 0);
+ free (block);
return song_location;
}
diff -ur rio500-0.8.1/librio500/librio500_api.h rio500-0.8.1-wg/librio500/librio500_api.h
--- rio500-0.8.1/librio500/librio500_api.h Thu Feb 7 15:56:57 2002
+++ rio500-0.8.1-wg/librio500/librio500_api.h Wed Oct 16 23:09:41 2002
@@ -77,8 +77,7 @@
int rio_set_font(Rio500 *, char *font_name, int font_number);
int rio_set_card(Rio500 *, int card);
unsigned long rio_get_mem_total (Rio500 *);
-#define rio_get_card_number(x) \
- query_card_count(x->rio_dev)
+unsigned long rio_get_card_number (Rio500 *);
void rio_get_revision(Rio500 *, int *major, int *minor);
int rio_get_song (Rio500 *, char *filename, int folder_num, int song_num);
diff -ur rio500-0.8.1/scripts/Makefile.in rio500-0.8.1-wg/scripts/Makefile.in
--- rio500-0.8.1/scripts/Makefile.in Wed May 22 21:15:43 2002
+++ rio500-0.8.1-wg/scripts/Makefile.in Wed Oct 16 23:09:41 2002
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
diff -ur rio500-0.8.1/src/Makefile.am rio500-0.8.1-wg/src/Makefile.am
--- rio500-0.8.1/src/Makefile.am Tue Jan 22 08:47:28 2002
+++ rio500-0.8.1-wg/src/Makefile.am Wed Oct 16 23:09:41 2002
@@ -18,7 +18,7 @@
CFLAGS = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(USB_CFLAGS)
-LDADD = $(USB_LIBS) -L../librio500 @GLIB_LIBS@ -lrio500_api -lrio500 $(EFENCE_LIB)
+LDADD = -L../librio500 -lrio500_api -lrio500 $(USB_LIBS) @GLIB_LIBS@ $(EFENCE_LIB)
GETOPT_FILES = getopt.c getopt1.c
diff -ur rio500-0.8.1/src/Makefile.in rio500-0.8.1-wg/src/Makefile.in
--- rio500-0.8.1/src/Makefile.in Wed May 22 21:15:41 2002
+++ rio500-0.8.1-wg/src/Makefile.in Wed Oct 16 23:09:41 2002
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
@@ -127,7 +127,7 @@
CFLAGS = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(USB_CFLAGS)
-LDADD = $(USB_LIBS) -L../librio500 @GLIB_LIBS@ -lrio500_api -lrio500 $(EFENCE_LIB)
+LDADD = -L../librio500 -lrio500_api -lrio500 $(USB_LIBS) @GLIB_LIBS@ $(EFENCE_LIB)
GETOPT_FILES = getopt.c getopt1.c
@@ -348,7 +348,6 @@
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
-
info-am:
info: info-am
dvi-am:
diff -ur rio500-0.8.1/src/rio_add_song.c rio500-0.8.1-wg/src/rio_add_song.c
--- rio500-0.8.1/src/rio_add_song.c Mon Apr 15 14:09:13 2002
+++ rio500-0.8.1-wg/src/rio_add_song.c Wed Oct 16 23:22:33 2002
@@ -600,8 +600,6 @@
BYTE *block, *p;
int num_chunks, song_location;
- block = (char *)malloc (0x80000);
-
i = 0;
input_file = open (filename, O_RDONLY);
if (input_file == -1)
@@ -609,6 +607,8 @@
size = file_size (filename);
+ block = (char *)malloc (0x80000);
+
num_blocks = size / 0x10000;
remainder = size % 0x10000;
@@ -619,7 +619,7 @@
num_chunks = 0x10;
total = 0;
blocks_left = num_blocks - num_chunks;
-
+
send_command (rio_dev, 0x4f, 0xffff, card);
while (blocks_left > 0)
{
@@ -691,6 +691,7 @@
fprintf (stderr, "Wrote song to offset 0x%04x\n", song_location);
#endif
+ free (block);
return song_location;
}
@@ -890,5 +891,3 @@
/* Processing any filename args happens in main code. */
}
-
-
diff -ur rio500-0.8.1/src/rio_format.c rio500-0.8.1-wg/src/rio_format.c
--- rio500-0.8.1/src/rio_format.c Mon Apr 15 14:09:13 2002
+++ rio500-0.8.1-wg/src/rio_format.c Wed Oct 16 23:09:41 2002
@@ -28,11 +28,12 @@
#include <errno.h>
#include <string.h>
+#include "config.h"
+
#ifdef WITH_USBDEVFS
#include <usb.h>
#endif
-#include "config.h"
#ifdef ENABLE_NLS
#include <locale.h>
#endif
diff -ur rio500-0.8.1/src/rio_get_song.c rio500-0.8.1-wg/src/rio_get_song.c
--- rio500-0.8.1/src/rio_get_song.c Thu Apr 5 18:28:59 2001
+++ rio500-0.8.1-wg/src/rio_get_song.c Wed Oct 16 23:09:41 2002
@@ -28,6 +28,7 @@
#include <fcntl.h>
#include <errno.h>
+#include "config.h"
#include "librio500.h"
#include "i18n.h"
---------------------------------------
Received: (at 165192-done) by bugs.debian.org; 31 Jul 2005 22:35:23 +0000
>From tbm@cyrius.com Sun Jul 31 15:35:23 2005
Return-path: <tbm@cyrius.com>
Received: from sorrow.cyrius.com [65.19.161.204]
by spohr.debian.org with esmtp (Exim 3.36 1 (Debian))
id 1DzMOx-0000Dh-00; Sun, 31 Jul 2005 15:35:23 -0700
Received: by sorrow.cyrius.com (Postfix, from userid 10)
id 288E164D55; Sun, 31 Jul 2005 22:35:13 +0000 (UTC)
Received: by deprecation.cyrius.com (Postfix, from userid 1000)
id E1098870D; Sun, 31 Jul 2005 23:35:08 +0100 (BST)
Date: Sun, 31 Jul 2005 23:35:08 +0100
From: Martin Michlmayr <tbm@cyrius.com>
To: 165192-done@bugs.debian.org, 193354-done@bugs.debian.org,
317782-done@bugs.debian.org
Subject: Removed from Debian - unmaintained
Message-ID: <20050731223508.GA31066@deprecation.cyrius.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.9i
Delivered-To: 165192-done@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level:
X-Spam-Status: No, hits=-3.0 required=4.0 tests=BAYES_00 autolearn=no
version=2.60-bugs.debian.org_2005_01_02
X-CrossAssassin-Score: 132
This package has now been removed from Debian because nobody was
interested in maintaining it; see
http://lists.debian.org/debian-devel-announce/2005/06/msg00014.html
for more information.
--
Martin Michlmayr
http://www.cyrius.com/
Reply to: