devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Allow building beastpatcher with libmtp 0.2.[0-5].

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21249 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2009-06-11 19:55:28 +00:00
parent 460a1c4497
commit 864a4787b0
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
utils/MTP/beastpatcher/Makefile
View file

@ -19,6 +19,9 @@ LIBS = /usr/lib/libmtp.a /usr/lib/libusb.a
CFLAGS += $(shell printf \ CFLAGS += $(shell printf \
'\#include <libmtp.h>\nlibmtp version: LIBMTP_VERSION\n' | \ '\#include <libmtp.h>\nlibmtp version: LIBMTP_VERSION\n' | \
gcc -E -P - -o - | grep -q '^libmtp version: 0\.2' && echo '-DOLDMTP') gcc -E -P - -o - | grep -q '^libmtp version: 0\.2' && echo '-DOLDMTP')
CFLAGS += $(shell printf \
'\#include <libmtp.h>\nlibmtp version: LIBMTP_VERSION\n' | \
gcc -E -P - -o - | grep -q '^libmtp version: 0\.2\.[0-5]' && echo '-DREALLYOLDMTP')
endif endif
WINLIBS = ../MTP_DLL.dll WINLIBS = ../MTP_DLL.dll

5
utils/MTP/beastpatcher/mtp_libmtp.c
View file

@ -78,11 +78,14 @@ int mtp_scan(struct mtp_info_t* mtp_info)
else else
{ {
/* NOTE: These strings are filled with zeros in mtp_init() */ /* NOTE: These strings are filled with zeros in mtp_init() */
#ifndef REALLYOLDMTP
if ((str = LIBMTP_Get_Manufacturername(mtp_info->device))) if ((str = LIBMTP_Get_Manufacturername(mtp_info->device)))
{ {
strncpy(mtp_info->manufacturer, str, sizeof(mtp_info->manufacturer)-1); strncpy(mtp_info->manufacturer, str, sizeof(mtp_info->manufacturer)-1);
} }
#else
strcpy(mtp_info->manufacturer, "(unknown manufacturer)");
#endif
if ((str = LIBMTP_Get_Modelname(mtp_info->device))) if ((str = LIBMTP_Get_Modelname(mtp_info->device)))
{ {