len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-15 08:02:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

WPS editor:

Browse source 
* Simplify Makefile
 * Get rid of buildall.*
 * Change library loading behaviour to work with MODEL_NAME
Screenshot:
 * Simplify Makefile
config-*.h:
 * Add MODEL_NAME


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18407 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Maurus Cuelenaere 2008-09-04 14:49:53 +00:00
parent ebe3e032b9
commit 561df3827e
49 changed files with 160 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/export/config-c100.h
View file

@ -3,6 +3,8 @@
*/
#define TARGET_TREE /* this target is using the target tree system */
#define MODEL_NAME "Sandisk Sansa c100 series"
/* For Rolo and boot loader */
#define MODEL_NUMBER 30

2
firmware/export/config-c200.h
View file

@ -5,7 +5,7 @@
/* For Rolo and boot loader */
#define MODEL_NUMBER 20
#define MODEL_NAME "Sandisk Sansa c200"
#define MODEL_NAME "Sandisk Sansa c200 series"
#define HW_SAMPR_CAPS (SAMPR_CAP_44)

2
firmware/export/config-cowond2.h
View file

@ -6,6 +6,8 @@
/* For Rolo and boot loader */
#define MODEL_NUMBER 24
#define MODEL_NAME "Cowon iAudio D2"
/* Produce a dual-boot bootloader.bin for mktccboot */
#define TCCBOOT

2
firmware/export/config-creativezv.h
View file

@ -28,6 +28,8 @@
#define CREATIVE_ZV 1
#define MODEL_NAME "Creative Zen Vision"
/* This makes it part of the Creative Zen Vision family :) */
#define CREATIVE_ZVx 1

2
firmware/export/config-creativezvm.h
View file

@ -28,6 +28,8 @@
#define CREATIVE_ZVM 1
#define MODEL_NAME "Creative Zen Vision: M"
/* This makes it part of the Creative Zen Vision family :) */
#define CREATIVE_ZVx 1

2
firmware/export/config-creativezvm60gb.h
View file

@ -28,6 +28,8 @@
#define CREATIVE_ZVM60GB 1
#define MODEL_NAME "Creative Zen Vision:M 60GB"
/* This makes it part of the Creative Zen Vision family :) */
#define CREATIVE_ZVx 1

2
firmware/export/config-e200.h
View file

@ -5,7 +5,7 @@
/* For Rolo and boot loader */
#define MODEL_NUMBER 16
#define MODEL_NAME "Sandisk Sansa e200"
#define MODEL_NAME "Sandisk Sansa e200 series"
#define HW_SAMPR_CAPS (SAMPR_CAP_44)

2
firmware/export/config-fmrecorder.h
View file

@ -1,6 +1,8 @@
/* define this if you use an ATA controller */
#define HAVE_ATA
#define MODEL_NAME "Archos FM Recorder"
/* define this if you have recording possibility */
#define HAVE_RECORDING

2
firmware/export/config-gigabeat-s.h
View file

@ -7,6 +7,8 @@
#define TOSHIBA_GIGABEAT_S 1
#define MODEL_NAME "Toshiba Gigabeat S"
/* For Rolo and boot loader */
#define MODEL_NUMBER 21

2
firmware/export/config-gigabeat.h
View file

@ -5,6 +5,8 @@
#define TOSHIBA_GIGABEAT_F 1
#define MODEL_NAME "Toshiba Gigabeat F"
/* For Rolo and boot loader */
#define MODEL_NUMBER 18

2
firmware/export/config-h100.h
View file

@ -9,6 +9,8 @@
*/
#define IRIVER_H100_SERIES 1
#define MODEL_NAME "iriver iHP-100 series"
/* For Rolo and boot loader */
#define MODEL_NUMBER 1

2
firmware/export/config-h120.h
View file

@ -4,6 +4,8 @@
*/
#define IRIVER_H100_SERIES 1
#define MODEL_NAME "iriver H120/H140"
/* For Rolo and boot loader */
#define MODEL_NUMBER 0

2
firmware/export/config-h300.h
View file

@ -4,6 +4,8 @@
*/
#define IRIVER_H300_SERIES 1
#define MODEL_NAME "iriver H300 series"
/* For Rolo and boot loader */
#define MODEL_NUMBER 2

2
firmware/export/config-hdd1630.h
View file

@ -1,5 +1,5 @@
/*
* This config file is for the iriver H10 20Gb
* This config file is for the Philips GoGear HDD1630
*/
#define TARGET_TREE /* this target is using the target tree system */

2
firmware/export/config-iaudiom3.h
View file

@ -6,6 +6,8 @@
/* For Rolo and boot loader */
#define MODEL_NUMBER 25
#define MODEL_NAME "iAudio M3"
/* define this if you use an ATA controller */
#define HAVE_ATA

2
firmware/export/config-iaudiom5.h
View file

@ -6,6 +6,8 @@
/* For Rolo and boot loader */
#define MODEL_NUMBER 17
#define MODEL_NAME "iAudio M5"
/* define this if you use an ATA controller */
#define HAVE_ATA

2
firmware/export/config-iaudiox5.h
View file

@ -6,6 +6,8 @@
/* For Rolo and boot loader */
#define MODEL_NUMBER 10
#define MODEL_NAME "iAudio X5"
/* define this if you use an ATA controller */
#define HAVE_ATA

2
firmware/export/config-ifp7xx.h
View file

@ -5,6 +5,8 @@
#define IRIVER_IFP7XX_SERIES 1
#define MODEL_NAME "iriver iFP-799"
/* For Rolo and boot loader */
#define MODEL_NUMBER 6

2
firmware/export/config-ipod1g2g.h
View file

@ -5,6 +5,8 @@
#define IPOD_ARCH 1
#define MODEL_NAME "Apple iPod 1g/2g"
/* For Rolo and boot loader */
#define MODEL_NUMBER 19

2
firmware/export/config-ipod3g.h
View file

@ -6,6 +6,8 @@
#define IPOD_ARCH 1
#define MODEL_NAME "Apple iPod 3g"
/* For Rolo and boot loader */
#define MODEL_NUMBER 7

2
firmware/export/config-ipod4g.h
View file

@ -5,6 +5,8 @@
#define IPOD_ARCH 1
#define MODEL_NAME "Apple iPod 4g Grayscale"
/* For Rolo and boot loader */
#define MODEL_NUMBER 8

2
firmware/export/config-ipodcolor.h
View file

@ -5,6 +5,8 @@
#define IPOD_ARCH 1
#define MODEL_NAME "Apple iPod Color/Photo"
/* For Rolo and boot loader */
#define MODEL_NUMBER 3

2
firmware/export/config-ipodmini.h
View file

@ -5,6 +5,8 @@
#define IPOD_ARCH 1
#define MODEL_NAME "Apple iPod Mini 1g"
/* For Rolo and boot loader */
#define MODEL_NUMBER 9

2
firmware/export/config-ipodmini2g.h
View file

@ -5,6 +5,8 @@
#define IPOD_ARCH 1
#define MODEL_NAME "Apple iPod Mini 2g"
/* For Rolo and boot loader */
#define MODEL_NUMBER 11

2
firmware/export/config-ipodnano.h
View file

@ -5,6 +5,8 @@
#define IPOD_ARCH 1
#define MODEL_NAME "Apple iPod Nano 1g"
/* For Rolo and boot loader */
#define MODEL_NUMBER 4

2
firmware/export/config-ipodvideo.h
View file

@ -5,6 +5,8 @@
#define IPOD_ARCH 1
#define MODEL_NAME "Apple iPod Video"
/* For Rolo and boot loader */
#define MODEL_NUMBER 5

2
firmware/export/config-logikdax.h
View file

@ -6,6 +6,8 @@
/* For Rolo and boot loader */
#define MODEL_NUMBER 27
#define MODEL_NAME "Logik DAX MP3/DAB"
/* define this if you have recording possibility */
//#define HAVE_RECORDING

2
firmware/export/config-m200.h
View file

@ -6,6 +6,8 @@
/* For Rolo and boot loader */
#define MODEL_NUMBER 29
#define MODEL_NAME "Sandisk Sansa m200 series"
/* Enable FAT16 support */
#define HAVE_FAT16SUPPORT

4
firmware/export/config-meizu-m6sl.h
View file

@ -1,11 +1,13 @@
/*
* This config file is for iAudio X5
* This config file is for Meizu M6SL
*/
#define TARGET_TREE /* this target is using the target tree system */
/* For Rolo and boot loader */
#define MODEL_NUMBER 1
#define MODEL_NAME "Meizu M6SL"
/* define this if you have recording possibility */
//#define HAVE_RECORDING

1
firmware/export/config-mrobe500.h
View file

@ -27,6 +27,7 @@
#define CONFIG_SDRAM_START 0x00900000
#define OLYMPUS_MROBE_500 1
#define MODEL_NAME "Olympus M:Robe 500i"
/* For Rolo and boot loader */
#define MODEL_NUMBER 22

2
firmware/export/config-ondavx747.h
View file

@ -28,6 +28,8 @@
#define ONDA_VX747 1
#define MODEL_NAME "Onda VX747"
/* For Rolo and boot loader */
#define MODEL_NUMBER 30

2
firmware/export/config-ondiofm.h
View file

@ -1,6 +1,8 @@
/* define this if you have recording possibility */
#define HAVE_RECORDING
#define MODEL_NAME "Ondio FM"
/* Define bitmask of input sources - recordable bitmask can be defined
explicitly if different */
#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN)

2
firmware/export/config-ondiosp.h
View file

@ -1,6 +1,8 @@
/* define this if you have a bitmap LCD display */
#define HAVE_LCD_BITMAP
#define MODEL_NAME "Ondio SP"
/* define this if you can flip your LCD */
#define HAVE_LCD_FLIP

2
firmware/export/config-player.h
View file

@ -1,6 +1,8 @@
/* define this if you use an ATA controller */
#define HAVE_ATA
#define MODEL_NAME "Archos Player/Studio"
/* define this if you have a charcell LCD display */
#define HAVE_LCD_CHARCELLS

2
firmware/export/config-recorder.h
View file

@ -1,6 +1,8 @@
/* define this if you use an ATA controller */
#define HAVE_ATA
#define MODEL_NAME "Archos Recorder"
/* define this if you have recording possibility */
#define HAVE_RECORDING

2
firmware/export/config-recorderv2.h
View file

@ -1,6 +1,8 @@
/* define this if you use an ATA controller */
#define HAVE_ATA
#define MODEL_NAME "Archos Recorder v2"
/* define this if you have recording possibility */
#define HAVE_RECORDING

2
firmware/export/config-tpj1022.h
View file

@ -4,6 +4,8 @@
#define TARGET_TREE /* this target is using the target tree system */
#define MODEL_NAME "Tatung Elio TPJ-1022"
/* For Rolo and boot loader */
#define MODEL_NUMBER 15

9
utils/wpseditor/buildall.bat
View file

@ -1,9 +0,0 @@
@echo off
echo qmake...
qmake
echo Building gui...
mingw32-make 1>nul
echo Building libs...
cd libwps
call buildall.bat 2>nul
cd ..

4
utils/wpseditor/buildall.sh
View file

@ -1,4 +0,0 @@
#!/bin/sh
qmake && make
cd libwps
./buildall.sh 2> /dev/null

23
utils/wpseditor/gui/src/qwpsdrawer.cpp
View file

@ -17,14 +17,14 @@ QImage QWpsDrawer::backdrop;
proxy_api QWpsDrawer::api;
QWpsDrawer::QWpsDrawer( QWpsState *ws,QTrackState *ms, QWidget *parent )
: QWidget(parent),wpsState(ws),trackState(ms),showGrid(false),mCurTarget("h10_5gb") {
: QWidget(parent),wpsState(ws),trackState(ms),showGrid(false),mCurTarget(qApp->applicationDirPath()+"/libwps_IRIVER_H10_5GB") {
tryResolve();
newTempWps();
}
bool QWpsDrawer::tryResolve() {
QLibrary lib(qApp->applicationDirPath()+"/libwps_"+mCurTarget);
QLibrary lib(mCurTarget);
lib_wps_init = (pfwps_init)lib.resolve("wps_init");
lib_wps_display = (pfwps_display)lib.resolve("wps_display");
lib_wps_refresh = (pfwps_refresh)lib.resolve("wps_refresh");
@ -47,7 +47,7 @@ bool QWpsDrawer::tryResolve() {
api.load_wps_backdrop = &QWpsDrawer::load_wps_backdrop;
api.read_bmp_file = &QWpsDrawer::read_bmp_file;
api.debugf = &qlogger;
qDebug()<<(qApp->applicationDirPath()+"/libwps_"+mCurTarget+" resolved");
qDebug()<<(mCurTarget+" resolved");
}
return mResolved;
}
@ -222,7 +222,7 @@ QString QWpsDrawer::getModelName(QString libraryName) {
QList<QString> QWpsDrawer::getTargets() {
QList<QString> list ;
QDir d = QDir(qApp->applicationDirPath());
QFileInfoList libs = d.entryInfoList(QStringList("libwps*"));
QFileInfoList libs = d.entryInfoList(QStringList("libwps_*"));
qDebug() << libs.size()<<"libs found";
for (int i = 0; i < libs.size(); i++) {
QString modelName = getModelName(libs[i].absoluteFilePath());
@ -230,15 +230,24 @@ QList<QString> QWpsDrawer::getTargets() {
if (modelName == "unknown")
continue;
list.append(modelName);
libs_array[i].target_name = modelName;
libs_array[i].lib = libs[i].absoluteFilePath();
}
return list;
}
bool QWpsDrawer::setTarget(QString target) {
QLibrary lib(qApp->applicationDirPath()+"/libwps_"+mCurTarget);
foreach(lib_t cur_lib, libs_array)
{
if(cur_lib.target_name == target)
{
QLibrary lib(cur_lib.lib);
//lib.unload();
if (getModelName("libwps_"+target)!="unknown") {
mCurTarget = target;
if (getModelName(cur_lib.lib) != "unknown")
{
mCurTarget = cur_lib.lib;
return tryResolve();
}
}
}
return false;
}

8
utils/wpseditor/gui/src/qwpsdrawer.h
View file

@ -5,6 +5,7 @@
#include <QPixmap>
#include <QPointer>
#include <QTemporaryFile>
#include <QMap>
#include "wpsstate.h"
@ -38,6 +39,13 @@ class QWpsDrawer : public QWidget {
QString mCurTarget;
static QString mTmpWpsString;
struct lib_t
{
QString target_name;
QString lib;
};
QMap<int, lib_t> libs_array;
protected:
virtual void paintEvent(QPaintEvent * event);

59
utils/wpseditor/libwps/Makefile
View file

@ -8,15 +8,13 @@
#
ROOT=../../..
OS = w32
CC = gcc
MKDIR = mkdir -p
ifeq ($(findstring MINGW,$(shell uname)),MINGW)
ifneq ($or($(findstring MINGW,$(shell uname)),$(findstring Windows_NT,$(OS))),)
OS = w32
CC = mingw32-gcc
COPY = copy
RM = rm
RM = del
EXT = .dll
LDFLAGS = -DBUILD_DLL
endif
ifeq ($(findstring Linux,$(shell uname)),Linux)
@ -24,9 +22,19 @@ ifeq ($(findstring Linux,$(shell uname)),Linux)
CC = gcc
COPY = cp
RM = rm -f
EXT = .so
LDFLAGS = -fPIC
endif
TARGETS=IRIVER_H10 \
IRIVER_H10_5GB \
IPOD_COLOR \
IPOD_NANO \
IPOD_VIDEO \
GIGABEAT_F \
GIGABEAT_S \
SANSA_E200 \
SANSA_C200
SOURCES= \
src/api.c \
@ -50,7 +58,6 @@ SOURCES= \
$(ROOT)/firmware/lru.c \
$(ROOT)/firmware/mp3data.c \
$(ROOT)/firmware/replaygain.c
# $(ROOT)/apps/recorder/bmp.c
# $(ROOT)/apps/abrepeat.c \
# $(ROOT)/apps/action.c \
@ -68,34 +75,14 @@ INCLUDE=-I src/include \
CFLAGS = -g -Wall -D__PCTOOL__ -DWPSEDITOR -DDEBUG -DROCKBOX_DIR_LEN=1 -DBUTTON_REMOTE
all:
@echo To build, run the buildall.sh script
RESULTS := $(patsubst %,libwps_%$(EXT),$(TARGETS))
build: build-$(OS)
all: $(RESULTS)
@$(COPY) $(RESULTS) ../gui/bin/
build-w32: $(SOURCES)
@echo CC [$(TARGET)]
@$(CC) $(INCLUDE) $(CFLAGS) -D$(TARGET) -DTARGET_MODEL=\"$(MODEL)\" -DBUILD_DLL $(SOURCES) -shared -o libwps_$(MODEL).dll
libwps_%$(EXT): $(SOURCES)
@echo CC [$(subst libwps_,,$(subst $(EXT),,$@))]
@$(CC) $(INCLUDE) $(CFLAGS) -D$(subst libwps_,,$(subst $(EXT),,$@)) $(LDFLAGS) -shared -o $@ $+
build-linux: $(SOURCES)
@echo CC [$(TARGET)]
@$(CC) $(INCLUDE) $(CFLAGS) -D$(TARGET) -DTARGET_MODEL=\"$(MODEL)\" -shared -Wl,-soname,libwps_$(MODEL).so,-olibwps_$(MODEL).so -fPIC $(SOURCES)
clean: clean-$(OS)
clean-w32:
$(RM) "libwps_$(MODEL).dll"
clean-linux:
$(RM) "libwps_$(MODEL).so"
shared: shared-$(OS)
shared-w32: $(SOURCES)
@echo CC [IRIVER_H10_5GB]
@$(CC) $(INCLUDE) $(CFLAGS) -DIRIVER_H10_5GB -DTARGET_MODEL=\"h10_5gb\" -DBUILD_DLL -shared $(SOURCES) -o ../gui/bin/libwps_h10_5gb.dll
shared-linux: $(SOURCES)
@echo CC [IRIVER_H10_5GB]
@$(CC) $(INCLUDE) $(CFLAGS) -DIRIVER_H10_5GB -DTARGET_MODEL=\"h10_5gb\" -shared -Wl,-soname,libwps_h10_5gb.so,-olibwps_h10_5gb.so -fPIC $(SOURCES)
@$(COPY) libwps_h10_5gb.so ../gui/bin/libwps_h10_5gb.so
clean:
$(RM) $(RESULTS)

4
utils/wpseditor/libwps/buildall.bat
View file

@ -1,4 +0,0 @@
@echo off
FOR /F "tokens=1,2* delims=, " %%i in (targets.txt) do @mingw32-make MODEL=%%j TARGET=%%i build 2>nul
echo Copying files...
xcopy /I /Y *.dll ..\gui\bin

9
utils/wpseditor/libwps/buildall.sh
View file

@ -1,9 +0,0 @@
#!/bin/sh
cat targets.txt | (
while read target model
do
make MODEL=$model TARGET=$target build
done
cp *.dll ../gui/bin
cp *.so ../gui/bin
)

7
utils/wpseditor/libwps/cleanall.sh
View file

@ -1,7 +0,0 @@
#!/bin/sh
cat targets.txt | (
while read target model
do
make MODEL=$model TARGET=$target clean
done
)

4
utils/wpseditor/libwps/src/proxy.c
View file

@ -23,8 +23,8 @@ pfdebugf dbgf = 0;
static char pluginbuf[PLUGIN_BUFFER_SIZE];
const char* get_model_name(){
#ifdef TARGET_MODEL
return TARGET_MODEL;
#ifdef MODEL_NAME
return MODEL_NAME;
#else
return "unknown";
#endif

9
utils/wpseditor/libwps/targets.txt
View file

@ -1,9 +0,0 @@
IRIVER_H10 h10
IRIVER_H10_5GB h10_5gb
IPOD_COLOR ipodcolor
IPOD_NANO ipodnano
IPOD_VIDEO ipodvideo
GIGABEAT_F gigabeatf
GIGABEAT_S gigabeats
SANSA_E200 e200
SANSA_C200 c200

18
utils/wpseditor/screenshot/Makefile
View file

@ -8,26 +8,12 @@
#
ROOT=../../..
OS = w32
CC = gcc
ifeq ($(findstring MINGW,$(shell uname)),MINGW)
OS = w32
CC = mingw32-gcc
RM = rm
endif
ifeq ($(findstring Linux,$(shell uname)),Linux)
OS = linux
CC = gcc
RM = rm -f
endif
COMMON = main.c gd_bmp.c
COMMON= main.c gd_bmp.c
INCLUDE=-I ../libwps/src \
INCLUDE = -I ../libwps/src \
-I $(ROOT)/apps/gui \
-I $(ROOT)/firmware/export \
-I $(ROOT)/apps/recorder \

4
utils/wpseditor/wpseditor.pro
View file

@ -1,2 +1,4 @@
SUBDIRS =gui/src/QPropertyEditor gui
TEMPLATE = subdirs
SUBDIRS = gui/src/QPropertyEditor gui libwps
libwps.commands = @$(MAKE) -C libwps
QMAKE_EXTRA_TARGETS += libwps