From max at tyndur.org Sat May 7 16:40:19 2011 From: max at tyndur.org (Max Reitz) Date: Sat, 7 May 2011 16:40:19 +0200 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_0/2=5D_MP3_f=C3=BCr_xply?= Message-ID: <1304779221-32095-1-git-send-email-max@tyndur.org> Diese beiden Patches fügen einen lbuild für die libmpg123 und die Version 0.0.3 von xply (aka player) hinzu, welche erstere benutzt, um MP3-Dateien abspielen zu können. From max at tyndur.org Sat May 7 16:40:20 2011 From: max at tyndur.org (Max Reitz) Date: Sat, 7 May 2011 16:40:20 +0200 Subject: [tyndur-devel] [PATCH 1/2] libmpg123 1.13.3 In-Reply-To: <1304779221-32095-1-git-send-email-max@tyndur.org> References: <1304779221-32095-1-git-send-email-max@tyndur.org> Message-ID: <1304779221-32095-2-git-send-email-max@tyndur.org> + lbuild für mpg123 1.13.3, extrahiert wird aber nur die libmpg123 (das Programm kann mangels Interface wie SDL schlecht genutzt werden) Signed-off-by: Max Reitz --- lbuilds/libmpg123/1.13.3/files/config.sub.patch | 13 + lbuilds/libmpg123/1.13.3/files/id3.patch | 28 +++ lbuilds/libmpg123/1.13.3/files/makefile.patch | 258 ++++++++++++++++++++ lbuilds/libmpg123/1.13.3/files/readers.patch | 38 +++ lbuilds/libmpg123/1.13.3/files/stubify.patch | 272 ++++++++++++++++++++++ lbuilds/libmpg123/1.13.3/libmpg123-1.13.3.lbuild | 56 +++++ 6 files changed, 665 insertions(+), 0 deletions(-) create mode 100644 lbuilds/libmpg123/1.13.3/files/config.sub.patch create mode 100644 lbuilds/libmpg123/1.13.3/files/id3.patch create mode 100644 lbuilds/libmpg123/1.13.3/files/makefile.patch create mode 100644 lbuilds/libmpg123/1.13.3/files/readers.patch create mode 100644 lbuilds/libmpg123/1.13.3/files/stubify.patch create mode 100644 lbuilds/libmpg123/1.13.3/libmpg123-1.13.3.lbuild diff --git a/lbuilds/libmpg123/1.13.3/files/config.sub.patch b/lbuilds/libmpg123/1.13.3/files/config.sub.patch new file mode 100644 index 0000000..46bf2e7 --- /dev/null +++ b/lbuilds/libmpg123/1.13.3/files/config.sub.patch @@ -0,0 +1,13 @@ +Index: src/mpg123-1.13.3/build/config.sub +=================================================================== +--- src.orig/mpg123-1.13.3/build/config.sub 2011-04-03 09:52:42.000000000 +0200 ++++ src/mpg123-1.13.3/build/config.sub 2011-05-06 23:49:19.000000000 +0200 +@@ -1264,7 +1264,7 @@ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ +- | -aos* | -aros* \ ++ | -aos* | -aros* | -tyndur* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ diff --git a/lbuilds/libmpg123/1.13.3/files/id3.patch b/lbuilds/libmpg123/1.13.3/files/id3.patch new file mode 100644 index 0000000..a3c85bd --- /dev/null +++ b/lbuilds/libmpg123/1.13.3/files/id3.patch @@ -0,0 +1,28 @@ +Index: src/mpg123-1.13.3/src/libmpg123/id3.c +=================================================================== +--- src.orig/mpg123-1.13.3/src/libmpg123/id3.c 2011-04-03 09:50:14.000000000 +0200 ++++ src/mpg123-1.13.3/src/libmpg123/id3.c 2011-05-07 00:56:57.000000000 +0200 +@@ -382,7 +382,7 @@ + store_id3_text(&localcom.text, text-1, realsize+1-(text-realdata), NOQUIET, 0); + if(localcom.text.fill > 0) + { +- fr->rva.gain[rva_mode] = (float) atof(localcom.text.p); ++ fr->rva.gain[rva_mode] = (float) strtod(localcom.text.p, NULL); + if(VERBOSE3) fprintf(stderr, "Note: RVA value %fdB\n", fr->rva.gain[rva_mode]); + fr->rva.peak[rva_mode] = 0; + fr->rva.level[rva_mode] = rva_level; +@@ -465,12 +465,12 @@ + { + if(is_peak) + { +- fr->rva.peak[rva_mode] = (float) atof(localex.text.p); ++ fr->rva.peak[rva_mode] = (float) strtod(localex.text.p, NULL); + if(VERBOSE3) fprintf(stderr, "Note: RVA peak %f\n", fr->rva.peak[rva_mode]); + } + else + { +- fr->rva.gain[rva_mode] = (float) atof(localex.text.p); ++ fr->rva.gain[rva_mode] = (float) strtod(localex.text.p, NULL); + if(VERBOSE3) fprintf(stderr, "Note: RVA gain %fdB\n", fr->rva.gain[rva_mode]); + } + fr->rva.level[rva_mode] = rva_level; diff --git a/lbuilds/libmpg123/1.13.3/files/makefile.patch b/lbuilds/libmpg123/1.13.3/files/makefile.patch new file mode 100644 index 0000000..53c993d --- /dev/null +++ b/lbuilds/libmpg123/1.13.3/files/makefile.patch @@ -0,0 +1,258 @@ +Index: src/mpg123-1.13.3/src/libmpg123/Makefile.am +=================================================================== +--- src.orig/mpg123-1.13.3/src/libmpg123/Makefile.am 2011-04-03 09:50:15.000000000 +0200 ++++ src/mpg123-1.13.3/src/libmpg123/Makefile.am 2011-05-07 02:59:11.000000000 +0200 +@@ -21,12 +21,14 @@ + + # The library can have different names, depending on largefile setup. + # Libtool macros think they're smart. Because of that mpg123.la does not work, it must be libmpg123.la . +-lib_LTLIBRARIES = libmpg123.la ++lib_LTLIBRARIES = libmpg123.a + nodist_include_HEADERS = mpg123.h + + libmpg123_la_LDFLAGS = -no-undefined -version-info @LIBMPG123_VERSION@ -export-symbols-regex '^mpg123_' + libmpg123_la_LIBADD = @DECODER_LOBJ@ @LFS_LOBJ@ ++libmpg123_a_LIBADD = @DECODER_OBJ@ @LFS_OBJ@ + libmpg123_la_DEPENDENCIES = @DECODER_LOBJ@ @LFS_LOBJ@ ++libmpg123_a_DEPENDENCIES = @DECODER_OBJ@ @LFS_OBJ@ + + libmpg123_la_SOURCES = \ + intsym.h \ +@@ -66,6 +68,8 @@ + index.h \ + index.c + ++libmpg123_a_SOURCES = $(libmpg123_la_SOURCES) ++ + EXTRA_libmpg123_la_SOURCES = \ + lfs_alias.c \ + lfs_wrap.c \ +@@ -137,3 +141,5 @@ + l12_integer_tables.h \ + l3_integer_tables.h + ++EXTRA_libmpg123_a_SOURCES = $(EXTRA_libmpg123_la_SOURCES) ++ +Index: src/mpg123-1.13.3/src/libmpg123/Makefile.in +=================================================================== +--- src.orig/mpg123-1.13.3/src/libmpg123/Makefile.in 2011-04-17 11:23:11.000000000 +0200 ++++ src/mpg123-1.13.3/src/libmpg123/Makefile.in 2011-05-07 02:59:02.000000000 +0200 +@@ -76,7 +76,11 @@ + am_libmpg123_la_OBJECTS = compat.lo parse.lo frame.lo format.lo \ + dct64.lo equalizer.lo id3.lo optimize.lo readers.lo tabinit.lo \ + libmpg123.lo index.lo ++am_libmpg123_a_OBJECTS = compat.o parse.o frame.o format.o \ ++ dct64.o equalizer.o id3.o optimize.o readers.o tabinit.o \ ++ libmpg123.o index.o + libmpg123_la_OBJECTS = $(am_libmpg123_la_OBJECTS) ++libmpg123_a_OBJECTS = $(am_libmpg123_a_OBJECTS) + libmpg123_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libmpg123_la_LDFLAGS) $(LDFLAGS) -o $@ +@@ -318,11 +322,13 @@ + + # The library can have different names, depending on largefile setup. + # Libtool macros think they're smart. Because of that mpg123.la does not work, it must be libmpg123.la . +-lib_LTLIBRARIES = libmpg123.la ++lib_LTLIBRARIES = libmpg123.a + nodist_include_HEADERS = mpg123.h + libmpg123_la_LDFLAGS = -no-undefined -version-info @LIBMPG123_VERSION@ -export-symbols-regex '^mpg123_' + libmpg123_la_LIBADD = @DECODER_LOBJ@ @LFS_LOBJ@ ++libmpg123_a_LIBADD = @DECODER_OBJ@ @LFS_OBJ@ + libmpg123_la_DEPENDENCIES = @DECODER_LOBJ@ @LFS_LOBJ@ ++libmpg123_a_DEPENDENCIES = @DECODER_OBJ@ @LFS_OBJ@ + libmpg123_la_SOURCES = \ + intsym.h \ + compat.c \ +@@ -360,6 +366,7 @@ + getcpuflags.h \ + index.h \ + index.c ++libmpg123_a_SOURCES = $(libmpg123_la_SOURCES) + + EXTRA_libmpg123_la_SOURCES = \ + lfs_alias.c \ +@@ -431,6 +438,7 @@ + getcpuflags.S \ + l12_integer_tables.h \ + l3_integer_tables.h ++EXTRA_libgmp123_a_SOURCES = $(EXTRA_libmpg123_la_SOURCES) + + all: all-am + +@@ -501,6 +509,8 @@ + done + libmpg123.la: $(libmpg123_la_OBJECTS) $(libmpg123_la_DEPENDENCIES) + $(libmpg123_la_LINK) -rpath $(libdir) $(libmpg123_la_OBJECTS) $(libmpg123_la_LIBADD) $(LIBS) ++libmpg123.a: $(libmpg123_a_OBJECTS) $(libmpg123_a_DEPENDENCIES) ++ ar rcs $@ $(libmpg123_a_OBJECTS) $(libmpg123_a_LIBADD) + testcpu$(EXEEXT): $(testcpu_OBJECTS) $(testcpu_DEPENDENCIES) + @rm -f testcpu$(EXEEXT) + $(LINK) $(testcpu_OBJECTS) $(testcpu_LDADD) $(LIBS) +Index: src/mpg123-1.13.3/src/Makefile.am +=================================================================== +--- src.orig/mpg123-1.13.3/src/Makefile.am 2011-04-03 09:50:15.000000000 +0200 ++++ src/mpg123-1.13.3/src/Makefile.am 2011-05-07 02:57:08.000000000 +0200 +@@ -5,12 +5,12 @@ + ## initially written by Nicholas J. Humfrey + + AM_CPPFLAGS = -DPKGLIBDIR="\"$(pkglibdir)\"" +-mpg123_LDADD = $(LIBLTDL) libmpg123/libmpg123.la @MODULE_OBJ@ @OUTPUT_OBJ@ @OUTPUT_LIBS@ ++mpg123_LDADD = $(LIBLTDL) libmpg123/libmpg123.a @MODULE_OBJ@ @OUTPUT_OBJ@ @OUTPUT_LIBS@ + mpg123_LDFLAGS = @EXEC_LT_LDFLAGS@ @OUTPUT_LDFLAGS@ + # Just mpg123_INCLUDES has no effect on build! Trying that before reverting to AM_CPPFLAGS. + INCLUDES = $(LTDLINCL) -I$(top_builddir)/src/libmpg123 -I$(top_srcdir)/src/libmpg123 + # libltdl is not mentioned here... it's not that trivial +-mpg123_DEPENDENCIES = @OUTPUT_OBJ@ @MODULE_OBJ@ libmpg123/libmpg123.la ++mpg123_DEPENDENCIES = @OUTPUT_OBJ@ @MODULE_OBJ@ libmpg123/libmpg123.a + + SUBDIRS = output libmpg123 + EXTRA_DIST = legacy_module.c module.c sfifo.c sfifo.h +@@ -142,7 +142,7 @@ + + # Would have to mention _all_ source files... Dammit, that's what the libmpg123/Makefile.am does! + # But again, the a make $something here needs that stupid rule... WHY??? +-libmpg123/libmpg123.la: config.h libmpg123/mpg123.h ++libmpg123/libmpg123.a: config.h libmpg123/mpg123.h + cd libmpg123 && $(MAKE) + + tests_seek_accuracy_SOURCES = \ +@@ -150,16 +150,16 @@ + libmpg123/compat.h \ + libmpg123/compat.c + +-tests_seek_accuracy_DEPENDENCIES = libmpg123/libmpg123.la +-tests_seek_accuracy_LDADD = libmpg123/libmpg123.la ++tests_seek_accuracy_DEPENDENCIES = libmpg123/libmpg123.a ++tests_seek_accuracy_LDADD = libmpg123/libmpg123.a + + tests_seek_whence_SOURCES = \ + tests/seek_whence.c \ + libmpg123/compat.h \ + libmpg123/compat.c + +-tests_seek_whence_DEPENDENCIES = libmpg123/libmpg123.la +-tests_seek_whence_LDADD = libmpg123/libmpg123.la ++tests_seek_whence_DEPENDENCIES = libmpg123/libmpg123.a ++tests_seek_whence_LDADD = libmpg123/libmpg123.a + + tests_noise_SOURCES = \ + tests/noise.c \ +@@ -174,13 +174,13 @@ + libmpg123/compat.h \ + libmpg123/compat.c + +-tests_text_DEPENDENCIES = libmpg123/libmpg123.la +-tests_text_LDADD = libmpg123/libmpg123.la ++tests_text_DEPENDENCIES = libmpg123/libmpg123.a ++tests_text_LDADD = libmpg123/libmpg123.a + + tests_plain_id3_SOURCES = \ + tests/plain_id3.c \ + libmpg123/compat.h \ + libmpg123/compat.c + +-tests_plain_id3_DEPENDENCIES = libmpg123/libmpg123.la +-tests_plain_id3_LDADD = libmpg123/libmpg123.la ++tests_plain_id3_DEPENDENCIES = libmpg123/libmpg123.a ++tests_plain_id3_LDADD = libmpg123/libmpg123.a +Index: src/mpg123-1.13.3/src/Makefile.in +=================================================================== +--- src.orig/mpg123-1.13.3/src/Makefile.in 2011-04-17 11:23:11.000000000 +0200 ++++ src/mpg123-1.13.3/src/Makefile.in 2011-05-07 02:57:08.000000000 +0200 +@@ -351,12 +351,12 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AM_CPPFLAGS = -DPKGLIBDIR="\"$(pkglibdir)\"" +-mpg123_LDADD = $(LIBLTDL) libmpg123/libmpg123.la @MODULE_OBJ@ @OUTPUT_OBJ@ @OUTPUT_LIBS@ ++mpg123_LDADD = $(LIBLTDL) libmpg123/libmpg123.a @MODULE_OBJ@ @OUTPUT_OBJ@ @OUTPUT_LIBS@ + mpg123_LDFLAGS = @EXEC_LT_LDFLAGS@ @OUTPUT_LDFLAGS@ + # Just mpg123_INCLUDES has no effect on build! Trying that before reverting to AM_CPPFLAGS. + INCLUDES = $(LTDLINCL) -I$(top_builddir)/src/libmpg123 -I$(top_srcdir)/src/libmpg123 + # libltdl is not mentioned here... it's not that trivial +-mpg123_DEPENDENCIES = @OUTPUT_OBJ@ @MODULE_OBJ@ libmpg123/libmpg123.la ++mpg123_DEPENDENCIES = @OUTPUT_OBJ@ @MODULE_OBJ@ libmpg123/libmpg123.a + SUBDIRS = output libmpg123 + EXTRA_DIST = legacy_module.c module.c sfifo.c sfifo.h + CLEANFILES = *.a +@@ -372,15 +372,15 @@ + libmpg123/compat.h \ + libmpg123/compat.c + +-tests_seek_accuracy_DEPENDENCIES = libmpg123/libmpg123.la +-tests_seek_accuracy_LDADD = libmpg123/libmpg123.la ++tests_seek_accuracy_DEPENDENCIES = libmpg123/libmpg123.a ++tests_seek_accuracy_LDADD = libmpg123/libmpg123.a + tests_seek_whence_SOURCES = \ + tests/seek_whence.c \ + libmpg123/compat.h \ + libmpg123/compat.c + +-tests_seek_whence_DEPENDENCIES = libmpg123/libmpg123.la +-tests_seek_whence_LDADD = libmpg123/libmpg123.la ++tests_seek_whence_DEPENDENCIES = libmpg123/libmpg123.a ++tests_seek_whence_LDADD = libmpg123/libmpg123.a + tests_noise_SOURCES = \ + tests/noise.c \ + libmpg123/compat.h \ +@@ -394,15 +394,15 @@ + libmpg123/compat.h \ + libmpg123/compat.c + +-tests_text_DEPENDENCIES = libmpg123/libmpg123.la +-tests_text_LDADD = libmpg123/libmpg123.la ++tests_text_DEPENDENCIES = libmpg123/libmpg123.a ++tests_text_LDADD = libmpg123/libmpg123.a + tests_plain_id3_SOURCES = \ + tests/plain_id3.c \ + libmpg123/compat.h \ + libmpg123/compat.c + +-tests_plain_id3_DEPENDENCIES = libmpg123/libmpg123.la +-tests_plain_id3_LDADD = libmpg123/libmpg123.la ++tests_plain_id3_DEPENDENCIES = libmpg123/libmpg123.a ++tests_plain_id3_LDADD = libmpg123/libmpg123.a + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +@@ -1072,7 +1072,7 @@ + + # Would have to mention _all_ source files... Dammit, that's what the libmpg123/Makefile.am does! + # But again, the a make $something here needs that stupid rule... WHY??? +-libmpg123/libmpg123.la: config.h libmpg123/mpg123.h ++libmpg123/libmpg123.a: config.h libmpg123/mpg123.h + cd libmpg123 && $(MAKE) + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +Index: src/mpg123-1.13.3/configure +=================================================================== +--- src.orig/mpg123-1.13.3/configure 2011-04-17 11:23:10.000000000 +0200 ++++ src/mpg123-1.13.3/configure 2011-05-07 02:57:08.000000000 +0200 +@@ -737,6 +737,7 @@ + INCLUDE_STDLIB_H + INCLUDE_STDIO_H + LFS_LOBJ ++LFS_OBJ + EXEC_LT_LDFLAGS + LT_LDFLAGS + MODULE_OBJ +@@ -14433,9 +14434,11 @@ + + if test "x$ac_cv_sys_file_offset_bits" = x || echo "$ac_cv_sys_file_offset_bits" | $GREP '[^0-9]' > /dev/null; then + LFS_LOBJ= ++ LFS_OBJ= + else + # Add dual-mode wrapper code. + LFS_LOBJ=lfs_wrap.lo ++ LFS_OBJ=lfs_wrap.o + fi + + # Using the lower level macros instead of AC_TYPE_* for compatibility with not freshest autoconf. +@@ -14734,6 +14737,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + LFS_LOBJ="$LFS_LOBJ lfs_alias.lo" ++ LFS_OBJ="$LFS_OBJ lfs_alias.o" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } diff --git a/lbuilds/libmpg123/1.13.3/files/readers.patch b/lbuilds/libmpg123/1.13.3/files/readers.patch new file mode 100644 index 0000000..0845a76 --- /dev/null +++ b/lbuilds/libmpg123/1.13.3/files/readers.patch @@ -0,0 +1,38 @@ +Index: src/mpg123-1.13.3/src/libmpg123/readers.c +=================================================================== +--- src.orig/mpg123-1.13.3/src/libmpg123/readers.c 2011-04-03 09:50:15.000000000 +0200 ++++ src/mpg123-1.13.3/src/libmpg123/readers.c 2011-05-07 00:54:57.000000000 +0200 +@@ -70,22 +70,7 @@ + This is needed for Shoutcast servers that have forgotten about us while connection was temporarily down. */ + static ssize_t timeout_read(mpg123_handle *fr, void *buf, size_t count) + { +- struct timeval tv; +- ssize_t ret = 0; +- fd_set fds; +- tv.tv_sec = fr->rdat.timeout_sec; +- tv.tv_usec = 0; +- FD_ZERO(&fds); +- FD_SET(fr->rdat.filept, &fds); +- ret = select(fr->rdat.filept+1, &fds, NULL, NULL, &tv); +- /* This works only with "my" read function. Not user-replaced. */ +- if(ret > 0) ret = read(fr->rdat.filept, buf, count); +- else +- { +- ret=-1; /* no activity is the error */ +- if(NOQUIET) error("stream timed out"); +- } +- return ret; ++ read(fr->rdat.filept, buf, count); + } + #endif + +@@ -926,9 +911,6 @@ + error("Timeout reading does not work with user-provided read function. Implement it yourself!"); + return -1; + } +- flags = fcntl(fr->rdat.filept, F_GETFL); +- flags |= O_NONBLOCK; +- fcntl(fr->rdat.filept, F_SETFL, flags); + fr->rdat.fdread = timeout_read; + fr->rdat.timeout_sec = fr->p.timeout; + fr->rdat.flags |= READER_NONBLOCK; diff --git a/lbuilds/libmpg123/1.13.3/files/stubify.patch b/lbuilds/libmpg123/1.13.3/files/stubify.patch new file mode 100644 index 0000000..dad08ae --- /dev/null +++ b/lbuilds/libmpg123/1.13.3/files/stubify.patch @@ -0,0 +1,272 @@ +Index: src/mpg123-1.13.3/src/common.c +=================================================================== +--- src.orig/mpg123-1.13.3/src/common.c 2011-04-03 09:50:15.000000000 +0200 ++++ src/mpg123-1.13.3/src/common.c 2011-05-07 02:44:12.000000000 +0200 +@@ -202,23 +202,6 @@ + off_t rno, no; + double basevol, realvol; + char *icy; +-#ifndef WIN32 +-#ifndef GENERIC +-/* Only generate new stat line when stderr is ready... don't overfill... */ +- { +- struct timeval t; +- fd_set serr; +- int n,errfd = fileno(stderr); +- +- t.tv_sec=t.tv_usec=0; +- +- FD_ZERO(&serr); +- FD_SET(errfd,&serr); +- n = select(errfd+1,NULL,&serr,NULL,&t); +- if(n <= 0) return; +- } +-#endif +-#endif + if( MPG123_OK == mpg123_position(fr, offset, buffsize, &no, &rno, &tim1, &tim2) + && MPG123_OK == mpg123_getvolume(fr, &basevol, &realvol, NULL) ) + { +Index: src/mpg123-1.13.3/src/control_generic.c +=================================================================== +--- src.orig/mpg123-1.13.3/src/control_generic.c 2011-04-03 09:50:15.000000000 +0200 ++++ src/mpg123-1.13.3/src/control_generic.c 2011-05-07 02:44:12.000000000 +0200 +@@ -239,8 +239,6 @@ + + int control_generic (mpg123_handle *fr) + { +- struct timeval tv; +- fd_set fds; + int n; + + /* ThOr */ +@@ -285,14 +283,8 @@ + + while (alive) + { +- tv.tv_sec = 0; +- tv.tv_usec = 0; +- FD_ZERO(&fds); +- FD_SET(control_file, &fds); + /* play frame if no command needs to be processed */ + if (mode == MODE_PLAYING) { +- n = select(32, &fds, NULL, NULL, &tv); +- if (n == 0) { + if (!play_frame()) + { + /* When the track ended, user may want to keep it open (to seek back), +@@ -326,15 +318,6 @@ + generic_sendmsg("I ICY-META: %s", meta != NULL ? meta : ""); + } + } +- } +- } +- else { +- /* wait for command */ +- while (1) { +- n = select(32, &fds, NULL, NULL, NULL); +- if (n > 0) +- break; +- } + } + + /* on error */ +@@ -362,7 +345,7 @@ + { + debug("fifo ended... reopening"); + close(control_file); +- control_file = open(param.fifo,O_RDONLY|O_NONBLOCK); ++ control_file = open(param.fifo,O_RDONLY); + if(control_file < 0){ error1("open of fifo failed... %s", strerror(errno)); break; } + continue; + } +@@ -646,7 +629,7 @@ + if(!strcasecmp(cmd, "V") || !strcasecmp(cmd, "VOLUME")) + { + double v; +- mpg123_volume(fr, atof(arg)/100); ++ mpg123_volume(fr, strtod(arg, NULL)/100); + mpg123_getvolume(fr, &v, NULL, NULL); /* Necessary? */ + generic_sendmsg("V %f%%", v * 100); + continue; +Index: src/mpg123-1.13.3/src/resolver.c +=================================================================== +--- src.orig/mpg123-1.13.3/src/resolver.c 2011-04-17 10:26:24.000000000 +0200 ++++ src/mpg123-1.13.3/src/resolver.c 2011-05-07 02:44:12.000000000 +0200 +@@ -140,16 +140,10 @@ + #if !defined (WANT_WIN32_SOCKETS) + static void nonblock(int sock) + { +- int flags = fcntl(sock, F_GETFL); +- flags |= O_NONBLOCK; +- fcntl(sock, F_SETFL, flags); + } + + static void block(int sock) + { +- int flags = fcntl(sock, F_GETFL); +- flags &= ~O_NONBLOCK; +- fcntl(sock, F_SETFL, flags); + } + + /* If we want a timeout, connect non-blocking and wait for that long... */ +@@ -168,42 +162,10 @@ + } + else if(errno == EINPROGRESS) + { +- struct timeval tv; +- fd_set fds; +- tv.tv_sec = param.timeout; +- tv.tv_usec = 0; +- + debug("in progress, waiting..."); + +- FD_ZERO(&fds); +- FD_SET(sockfd, &fds); +- err = select(sockfd+1, NULL, &fds, NULL, &tv); +- if(err > 0) +- { +- socklen_t len = sizeof(err); +- if( (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &err, &len) == 0) +- && (err == 0) ) +- { +- debug("non-blocking connect has been successful"); +- block(sockfd); +- return 0; +- } +- else +- { +- error1("connection error: %s", strerror(err)); ++ error1("connection error: %s", "Sockets sind doof"); + return -1; +- } +- } +- else if(err == 0) +- { +- error("connection timed out"); +- return -1; +- } +- else +- { +- error1("error from select(): %s", strerror(errno)); +- return -1; +- } + } + else + { +@@ -255,7 +217,6 @@ + server.sin_addr.s_addr = myaddr.s_addr; + } + else /* Just use the IP. */ +- if((server.sin_addr.s_addr = inet_addr(host->p)) == INADDR_NONE) + return -1; + + server.sin_port = htons(atoi(port->p)); +Index: src/mpg123-1.13.3/src/term.c +=================================================================== +--- src.orig/mpg123-1.13.3/src/term.c 2011-04-03 09:50:15.000000000 +0200 ++++ src/mpg123-1.13.3/src/term.c 2011-05-07 02:44:12.000000000 +0200 +@@ -24,7 +24,6 @@ + extern audio_output_t *ao; + + static int term_enable = 0; +-static struct termios old_tio; + int seeking = FALSE; + + /* Hm, next step would be some system in this, plus configurability... +@@ -57,30 +56,8 @@ + ,{ MPG123_PITCH_ZERO_KEY, 0, "reset pitch to zero" } + }; + +-void term_sigcont(int sig); +- +-/* This must call only functions safe inside a signal handler. */ +-int term_setup(struct termios *pattern) +-{ +- struct termios tio = *pattern; +- +- signal(SIGCONT, term_sigcont); +- +- tio.c_lflag &= ~(ICANON|ECHO); +- tio.c_cc[VMIN] = 1; +- tio.c_cc[VTIME] = 0; +- return tcsetattr(0,TCSANOW,&tio); +-} +- + void term_sigcont(int sig) + { +- term_enable = 0; +- +- if (term_setup(&old_tio) < 0) { +- fprintf(stderr,"Can't set terminal attributes\n"); +- return; +- } +- + term_enable = 1; + } + +@@ -89,17 +66,6 @@ + { + debug("term_init"); + +- term_enable = 0; +- +- if(tcgetattr(0,&old_tio) < 0) { +- fprintf(stderr,"Can't get terminal attributes\n"); +- return; +- } +- if(term_setup(&old_tio) < 0) { +- fprintf(stderr,"Can't set terminal attributes\n"); +- return; +- } +- + term_enable = 1; + } + +@@ -215,17 +181,8 @@ + /* long offset = 0; */ + + while(n > 0) { +- fd_set r; +- struct timeval t; + char val; + +- t.tv_sec=0; +- t.tv_usec=(do_delay) ? 10*1000 : 0; +- +- FD_ZERO(&r); +- FD_SET(0,&r); +- n = select(1,&r,NULL,NULL,&t); +- if(n > 0 && FD_ISSET(0,&r)) { + if(read(0,&val,1) <= 0) + break; + +@@ -423,7 +380,6 @@ + ; + } + } +- } + } + + void term_restore(void) +@@ -431,8 +387,6 @@ + + if(!term_enable) + return; +- +- tcsetattr(0,TCSAFLUSH,&old_tio); + } + + #endif +Index: src/mpg123-1.13.3/src/getlopt.c +=================================================================== +--- src.orig/mpg123-1.13.3/src/getlopt.c 2011-04-03 09:50:15.000000000 +0200 ++++ src/mpg123-1.13.3/src/getlopt.c 2011-05-07 02:44:12.000000000 +0200 +@@ -82,7 +82,7 @@ + else if(opt->flags & GLO_INT) + *((int *) opt->var) = atoi(loptarg); + else if(opt->flags & GLO_DOUBLE) +- *((double *) opt->var) = atof(loptarg); ++ *((double *) opt->var) = strtod(loptarg, NULL); + else prog_error(); + } + else diff --git a/lbuilds/libmpg123/1.13.3/libmpg123-1.13.3.lbuild b/lbuilds/libmpg123/1.13.3/libmpg123-1.13.3.lbuild new file mode 100644 index 0000000..0cafce2 --- /dev/null +++ b/lbuilds/libmpg123/1.13.3/libmpg123-1.13.3.lbuild @@ -0,0 +1,56 @@ +include toolchain +include lutils + +DESCRIPTION="libmpg123" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/libmpg123" +SRC_URI="http://sourceforge.net/projects/mpg123/files/mpg123/1.13.3/mpg123-1.13.3.tar.bz2/download" +PS="lib" + +LICENSE="unknown" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + cp ../../../distfiles/download ../../../distfiles/${P}.tar.bz2 + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd "${S}/mpg123-1.13.3" + ./configure \ + CC=`tc-cc` \ + --build=`tc-build` \ + --target=`tc-host` \ + --host=`tc-host` \ + --prefix="${R}" \ + --without-pic \ + --disable-shared \ + --enable-static \ + --with-audio=dummy \ + --with-module-suffix=.a \ + || die "configure failed" +} + +src_compile() { + cd "${S}/mpg123-1.13.3" + lmake || die "make failed" + cd .. +} + +src_install() { + cd "${S}/mpg123-1.13.3" + install -d "${D}${R}/1.13.3/lib" "${D}${R}/1.13.3/include" + cp src/libmpg123/libmpg123.a "${D}${R}/1.13.3/lib" || die "install failed" + cp src/libmpg123/mpg123.h "${D}${R}/1.13.3/include" || die "install failed" +} -- 1.7.5 From max at tyndur.org Sat May 7 16:40:21 2011 From: max at tyndur.org (Max Reitz) Date: Sat, 7 May 2011 16:40:21 +0200 Subject: [tyndur-devel] [PATCH 2/2] player 0.0.3 In-Reply-To: <1304779221-32095-1-git-send-email-max@tyndur.org> References: <1304779221-32095-1-git-send-email-max@tyndur.org> Message-ID: <1304779221-32095-3-git-send-email-max@tyndur.org> + Nächste Version von xply, mit MP3-Unterstützung per libmpg123 Signed-off-by: Max Reitz --- lbuilds/player/0.0.3/player-0.0.3.lbuild | 32 ++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) create mode 100644 lbuilds/player/0.0.3/player-0.0.3.lbuild diff --git a/lbuilds/player/0.0.3/player-0.0.3.lbuild b/lbuilds/player/0.0.3/player-0.0.3.lbuild new file mode 100644 index 0000000..07f343a --- /dev/null +++ b/lbuilds/player/0.0.3/player-0.0.3.lbuild @@ -0,0 +1,32 @@ +include toolchain +include lutils + +DESCRIPTION="Ein Musikabspielprogramm" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/player" +SRC_URI="http://www.xanclic.bplaced.net/${P}.tar.bz2" + +LICENSE="MIT" + +BUILD_DEPEND="=libogg-1.1.4 =libvorbis-1.2.3 =libmpg123-1.13.3 =libcdi-42" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 +} + +src_compile() { + cd ${MY_S} + + lmake CC="`tc-cc` -I `tc-incdir` -L `tc-libdir`" || die "make failed" + cd .. +} + +src_install() { + cd ${MY_S} + + mkdir -p ${D}/${R} + lmake install INSTALL_TO="${D}${R}" || die "make install failed" + rm -rf ${D}${R}/share +} -- 1.7.5 From kevin at tyndur.org Sat May 28 13:24:17 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sat, 28 May 2011 13:24:17 +0200 Subject: [tyndur-devel] [PATCH] kernel2: stdint.h in kernel.h einbinden Message-ID: <1306581857-26863-1-git-send-email-kevin@tyndur.org> ! kernel2: kernel.h benutzt uint64_t, also muss sie stdint.h einbinden Signed-off-by: Kevin Wolf --- src/kernel2/include/kernel.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/kernel2/include/kernel.h b/src/kernel2/include/kernel.h index 646ecb5..ae82d88 100644 --- a/src/kernel2/include/kernel.h +++ b/src/kernel2/include/kernel.h @@ -36,6 +36,8 @@ #ifndef _KERNEL_H_ #define _KERNEL_H_ +#include + extern uint64_t timer_ticks; __attribute__((noreturn)) void panic(char* message, ...); -- 1.6.0.2 From toni at tyndur.org Sat May 28 13:27:01 2011 From: toni at tyndur.org (Antoine Kaufmann) Date: Sat, 28 May 2011 13:27:01 +0200 Subject: [tyndur-devel] [PATCH] kernel2: stdint.h in kernel.h einbinden In-Reply-To: <1306581857-26863-1-git-send-email-kevin@tyndur.org> References: <1306581857-26863-1-git-send-email-kevin@tyndur.org> Message-ID: <20110528112700.GE30096@neo.geekcave.lan> On Sat, May 28 13:24, Kevin Wolf wrote: > ! kernel2: kernel.h benutzt uint64_t, also muss sie stdint.h einbinden > > Signed-off-by: Kevin Wolf Acked-by: Antoine Kaufmann -- Antoine Kaufmann -------------- nächster Teil -------------- Ein Dateianhang mit Binärdaten wurde abgetrennt... Dateiname : nicht verfügbar Dateityp : application/pgp-signature Dateigröße : 198 bytes Beschreibung: nicht verfügbar URL : From kevin at tyndur.org Sat May 28 14:30:46 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sat, 28 May 2011 14:30:46 +0200 Subject: [tyndur-devel] [PATCH 0/9] Patchsammlung aus dem LIOv2-Branch Message-ID: <1306585855-30470-1-git-send-email-kevin@tyndur.org> Das hier ist eine kleine Sammlung von Patches aus dem LIOv2-Branch, die eigentlich gar nichts mit LIOv2 zu tun haben und deswegen genausogut gleich in master reinkönnten. Es geht zumindest nichts offensichtliches kaputt, reviewen muss ich selber auch erst noch. Antoine Kaufmann (5): Shell: readlink() und symlink() benutzen shell: Tab-Completion fuer Objekte die Datei und Verzeichnis sind cdi: Implementierung von cdi_mem_alloc um Alignments >= 12 erweitert ata: Puffer fuer DMA auf 64K ausrichten ata: Bei Fehlern mehrmals probieren Kevin Wolf (4): shell: pipe braucht kein kaputtes fread mehr Pascal-RTL: Nicht mehr auf kaputtes fread verlassen Pascal-RTL: Short Writes berücksichtigen kernel2: BUG_ON-Makro eingeführt src/kernel2/include/kernel.h | 10 +++++++ src/modules/c/shell/cmds/pipe.c | 2 +- src/modules/c/shell/cmds/readlink.c | 8 +---- src/modules/c/shell/cmds/symlink.c | 8 +----- src/modules/c/shell/completion.c | 4 +- src/modules/cdi/ata/ata.c | 6 ++++ src/modules/cdi/ata/device.c | 2 +- src/modules/cdi/lib/mem.c | 50 ++++++++++++++++++++++++++++++++--- src/modules/pas/lib/rtl/sysfile.inc | 19 +++++++++++-- 9 files changed, 85 insertions(+), 24 deletions(-) From kevin at tyndur.org Sat May 28 14:30:47 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sat, 28 May 2011 14:30:47 +0200 Subject: [tyndur-devel] [PATCH 1/9] Shell: readlink() und symlink() benutzen In-Reply-To: <1306585855-30470-1-git-send-email-kevin@tyndur.org> References: <1306585855-30470-1-git-send-email-kevin@tyndur.org> Message-ID: <1306585855-30470-2-git-send-email-kevin@tyndur.org> From: Antoine Kaufmann * Shell: readlink() und symlink() benutzen, statt selbst mit fopen() rumzufrickeln. Signed-off-by: Antoine Kaufmann Signed-off-by: Kevin Wolf --- src/modules/c/shell/cmds/readlink.c | 8 ++------ src/modules/c/shell/cmds/symlink.c | 8 +------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/modules/c/shell/cmds/readlink.c b/src/modules/c/shell/cmds/readlink.c index 46497c2..51ef146 100644 --- a/src/modules/c/shell/cmds/readlink.c +++ b/src/modules/c/shell/cmds/readlink.c @@ -50,23 +50,19 @@ void readlink_display_usage(void); #endif { char buffer[4096]; - size_t len; + ssize_t len; if (argc != 2) { readlink_display_usage(); return -1; } - FILE* file = fopen(argv[1], "lr"); - if (file == NULL) { + if ((len = readlink(argv[1], buffer, sizeof(buffer) - 1)) < 0) { fprintf(stderr, TMS(readlink_error, "Fehler: Symlink konnte nicht gelesen werden!\n")); return -1; } - - len = fread(buffer, 1, 4095, file); buffer[len] = 0; - fclose(file); puts(buffer); diff --git a/src/modules/c/shell/cmds/symlink.c b/src/modules/c/shell/cmds/symlink.c index 2d3eeef..b9886f4 100644 --- a/src/modules/c/shell/cmds/symlink.c +++ b/src/modules/c/shell/cmds/symlink.c @@ -55,17 +55,11 @@ void symlink_display_usage(void); return -1; } - FILE* file = fopen(argv[1], "lw"); - - if (file == NULL) { + if (symlink(argv[2], argv[1])) { fprintf(stderr, TMS(symlink_error, "Fehler: Symlink konnte nicht erstellt werden!\n")); return -1; } - - char* dest = io_get_absolute_path(argv[2]); - fwrite(dest, 1, strlen(dest) + 1, file); - fclose(file); return EXIT_SUCCESS; } -- 1.6.0.2 From kevin at tyndur.org Sat May 28 14:30:48 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sat, 28 May 2011 14:30:48 +0200 Subject: [tyndur-devel] [PATCH 2/9] shell: pipe braucht kein kaputtes fread mehr In-Reply-To: <1306585855-30470-1-git-send-email-kevin@tyndur.org> References: <1306585855-30470-1-git-send-email-kevin@tyndur.org> Message-ID: <1306585855-30470-3-git-send-email-kevin@tyndur.org> ! shell: fread gibt mit LIOv2 die Anzahl der vollstaendig gelesenen Elemente zurueck, nicht die Anzahl Bytes Signed-off-by: Kevin Wolf --- src/modules/c/shell/cmds/pipe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/modules/c/shell/cmds/pipe.c b/src/modules/c/shell/cmds/pipe.c index a1644ed..e7d7ff4 100644 --- a/src/modules/c/shell/cmds/pipe.c +++ b/src/modules/c/shell/cmds/pipe.c @@ -92,7 +92,7 @@ void pipe_display_usage(void); while (no_eof || !feof(f)) { char buf[1024]; - size_t length = fread(buf, 1023, 1, f); + size_t length = fread(buf, 1, 1023, f); if (length > 0) { buf[length] = '\0'; printf("%s", buf); -- 1.6.0.2 From kevin at tyndur.org Sat May 28 14:30:49 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sat, 28 May 2011 14:30:49 +0200 Subject: [tyndur-devel] [PATCH 3/9] Pascal-RTL: Nicht mehr auf kaputtes fread verlassen In-Reply-To: <1306585855-30470-1-git-send-email-kevin@tyndur.org> References: <1306585855-30470-1-git-send-email-kevin@tyndur.org> Message-ID: <1306585855-30470-4-git-send-email-kevin@tyndur.org> ! Pascal-RTL: fread gibt mit LIOv2 die Anzahl der vollstaendig gelesenen Elemente zurueck, nicht die Anzahl Bytes Signed-off-by: Kevin Wolf --- src/modules/pas/lib/rtl/sysfile.inc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/pas/lib/rtl/sysfile.inc b/src/modules/pas/lib/rtl/sysfile.inc index e357f62..5143ef8 100644 --- a/src/modules/pas/lib/rtl/sysfile.inc +++ b/src/modules/pas/lib/rtl/sysfile.inc @@ -37,13 +37,13 @@ begin { TODO } end; Function Do_Write(f: THandle; src: Pointer; len: TSize): TSize; begin - Do_Write := c_fwrite(src, len, 1, f); + Do_Write := c_fwrite(src, 1, len, f); end; Function Do_Read(f: THandle; dest: Pointer; len: TSize): TSize; begin repeat - Do_Read := c_fread(dest, len, 1, f); + Do_Read := c_fread(dest, 1, len, f); until (Do_Read <> 0) or (c_feof(f)); end; -- 1.6.0.2 From kevin at tyndur.org Sat May 28 14:30:50 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sat, 28 May 2011 14:30:50 +0200 Subject: [tyndur-devel] [PATCH 4/9] shell: Tab-Completion fuer Objekte die Datei und Verzeichnis sind In-Reply-To: <1306585855-30470-1-git-send-email-kevin@tyndur.org> References: <1306585855-30470-1-git-send-email-kevin@tyndur.org> Message-ID: <1306585855-30470-5-git-send-email-kevin@tyndur.org> From: Antoine Kaufmann * shell: Tab-Completion fuer Objekte die Datei und Verzeichnis sind Signed-off-by: Antoine Kaufmann Signed-off-by: Kevin Wolf --- src/modules/c/shell/completion.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/c/shell/completion.c b/src/modules/c/shell/completion.c index 3a57615..939d892 100644 --- a/src/modules/c/shell/completion.c +++ b/src/modules/c/shell/completion.c @@ -284,9 +284,9 @@ static char** shell_file_matches(const char* word) char name[namelen + dir_len + 3]; char end; - // Bei Verzeichnissen wollen wir einen Slash am Ende, sonst ein + // Bei Verzeichnissen wollen wir einen Slash am Ende, sonst einen // Leerschlag - if (dentry->type == IO_DIRENTRY_DIR) { + if (dentry->type & IO_DIRENTRY_DIR) { end = '/'; } else { end = ' '; -- 1.6.0.2 From kevin at tyndur.org Sat May 28 14:30:51 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sat, 28 May 2011 14:30:51 +0200 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_5/9=5D_Pascal-RTL=3A_Short_Writ?= =?utf-8?q?es_ber=C3=BCcksichtigen?= In-Reply-To: <1306585855-30470-1-git-send-email-kevin@tyndur.org> References: <1306585855-30470-1-git-send-email-kevin@tyndur.org> Message-ID: <1306585855-30470-6-git-send-email-kevin@tyndur.org> ! Pascal-RTL: Do_Write muss die übergebenen Daten komplett schreiben, fwrite kann allerdings Short Writes zurückgeben. Signed-off-by: Kevin Wolf --- src/modules/pas/lib/rtl/sysfile.inc | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/modules/pas/lib/rtl/sysfile.inc b/src/modules/pas/lib/rtl/sysfile.inc index 5143ef8..e73fa5d 100644 --- a/src/modules/pas/lib/rtl/sysfile.inc +++ b/src/modules/pas/lib/rtl/sysfile.inc @@ -36,8 +36,21 @@ begin { TODO } end; Function Do_Write(f: THandle; src: Pointer; len: TSize): TSize; -begin - Do_Write := c_fwrite(src, 1, len, f); +var + ret: TSize; +begin + Do_Write := 0; + while len > 0 do begin + ret := c_fwrite(src, 1, len, f); + if (ret = 0) or (ret > len) then begin + InOutRes := 101; + exit(0); + end; + + Inc(Do_Write, ret); + Inc(src, ret); + Dec(len, ret); + end; end; Function Do_Read(f: THandle; dest: Pointer; len: TSize): TSize; -- 1.6.0.2 From kevin at tyndur.org Sat May 28 14:30:52 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sat, 28 May 2011 14:30:52 +0200 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_6/9=5D_kernel2=3A_BUG=5FON-Makr?= =?utf-8?q?o_eingef=C3=BChrt?= In-Reply-To: <1306585855-30470-1-git-send-email-kevin@tyndur.org> References: <1306585855-30470-1-git-send-email-kevin@tyndur.org> Message-ID: <1306585855-30470-7-git-send-email-kevin@tyndur.org> + kernel2: BUG_ON prüft eine Bedingung und führt zu einem Panic, wenn die Bedingung wahr ist Signed-off-by: Kevin Wolf --- src/kernel2/include/kernel.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/kernel2/include/kernel.h b/src/kernel2/include/kernel.h index ae82d88..7fa8209 100644 --- a/src/kernel2/include/kernel.h +++ b/src/kernel2/include/kernel.h @@ -42,4 +42,14 @@ extern uint64_t timer_ticks; __attribute__((noreturn)) void panic(char* message, ...); +#define BUG_ON(c) \ + do { \ + if (c) { \ + panic("BUG: %s:%d: " #c, __FILE__, __LINE__); \ + } \ + } while(0) + +#define MAX(a,b) ((a) > (b) ? (a) : (b)) +#define MIN(a,b) ((a) < (b) ? (a) : (b)) + #endif -- 1.6.0.2 From kevin at tyndur.org Sat May 28 14:30:53 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sat, 28 May 2011 14:30:53 +0200 Subject: [tyndur-devel] [PATCH 7/9] cdi: Implementierung von cdi_mem_alloc um Alignments >= 12 erweitert In-Reply-To: <1306585855-30470-1-git-send-email-kevin@tyndur.org> References: <1306585855-30470-1-git-send-email-kevin@tyndur.org> Message-ID: <1306585855-30470-8-git-send-email-kevin@tyndur.org> From: Antoine Kaufmann * cdi: Sorgt dafuer dass cdi_mem_alloc auch Speicherstuecke allozieren kann mit einem groesseren Alignment als nur Pagegroesse. Die Loesung ist zwar nicht wirklich schoen, duerfte aber den Zweck vorerst erfuellen. Signed-off-by: Antoine Kaufmann Signed-off-by: Kevin Wolf --- src/modules/cdi/lib/mem.c | 50 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 46 insertions(+), 4 deletions(-) diff --git a/src/modules/cdi/lib/mem.c b/src/modules/cdi/lib/mem.c index 36ad90d..5597206 100644 --- a/src/modules/cdi/lib/mem.c +++ b/src/modules/cdi/lib/mem.c @@ -35,23 +35,65 @@ struct cdi_mem_area* cdi_mem_alloc(size_t size, cdi_mem_flags_t flags) dma_mem_ptr_t buffer; struct cdi_mem_area* area; struct cdi_mem_sg_item* sg_item; + size_t alignment = flags & CDI_MEM_ALIGN_MASK; + size_t asize; - // Wir machen im Moment mal nur ganze Pages - if ((flags & CDI_MEM_ALIGN_MASK) > 12) { - return NULL; + // Wir vergeben nur ganze Pages + size = (size + 0xFFF) & (~0xFFF); + asize = size; + + // Wenn die physische Adresse nicht intressiert, koennen wir das Alignment + // ignorieren. + if ((flags & CDI_MEM_VIRT_ONLY)) { + alignment = 0; + } + + // Quick and dirty Loesung fuer das allozieren von Speicherbereichen mit + // einem Alignment von mehr als Page-Size: Wir nehmen einfach die Groesse + // plus einmal das Alignment, dann finden wir sicher ein Stueck mit + // passendem Alignment innerhalb des allozierten Bereichs. Den Rest geben + // wir wieder frei. + if (alignment > 12) { + // TODO: Momentan unterstuetzen wir das Alignment nur fuer + // physisch zusammenhaengende Bereiche. + if (!(flags & CDI_MEM_PHYS_CONTIGUOUS)) { + return NULL; + } + + asize = size + (1ULL << alignment); } // Speicher holen if (flags & CDI_MEM_VIRT_ONLY) { buffer = mem_dma_allocate(size, 0); } else { - buffer = mem_dma_allocate(size, 0x80); + buffer = mem_dma_allocate(asize, 0x80); } if (buffer.virt == NULL) { return NULL; } + // Wie oben erwaehnt alignment umsetzen + if (alignment > 12) { + uintptr_t amask = (1ULL << alignment) - 1; + uintptr_t astart = ((uintptr_t) buffer.phys + amask) & (~amask); + uintptr_t off = astart - (uintptr_t) buffer.phys; + + // Die beiden Stuecke vor und nach unserem ausgeschnittenen Bereich + // freigeben. + if (off) { + mem_free(buffer.virt, off); + } + if (asize - size - off) { + mem_free((vaddr_t) (((uintptr_t) buffer.virt) + size + off), + asize - size - off); + } + + buffer.phys = (paddr_t) astart; + buffer.virt = (vaddr_t) (((uintptr_t) buffer.virt) + off); + } + // cdi_mem_area anlegen und befuellen sg_item = malloc(sizeof(*sg_item)); *sg_item = (struct cdi_mem_sg_item) { -- 1.6.0.2 From kevin at tyndur.org Sat May 28 14:30:54 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sat, 28 May 2011 14:30:54 +0200 Subject: [tyndur-devel] [PATCH 8/9] ata: Puffer fuer DMA auf 64K ausrichten In-Reply-To: <1306585855-30470-1-git-send-email-kevin@tyndur.org> References: <1306585855-30470-1-git-send-email-kevin@tyndur.org> Message-ID: <1306585855-30470-9-git-send-email-kevin@tyndur.org> From: Antoine Kaufmann ! ata: Der Puffer fuer Busmaster-DMA muss auf 64K ausgerichtet sein damit DMA auch auf echter Hardware tut. Signed-off-by: Antoine Kaufmann Signed-off-by: Kevin Wolf --- src/modules/cdi/ata/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/modules/cdi/ata/device.c b/src/modules/cdi/ata/device.c index 6e33d52..9afa102 100644 --- a/src/modules/cdi/ata/device.c +++ b/src/modules/cdi/ata/device.c @@ -274,7 +274,7 @@ void ata_init_controller(struct ata_controller* controller) controller->prdt_phys = buf->paddr.items[0].start; buf = cdi_mem_alloc(ATA_DMA_MAXSIZE, - CDI_MEM_PHYS_CONTIGUOUS | CDI_MEM_DMA_4G); + CDI_MEM_PHYS_CONTIGUOUS | CDI_MEM_DMA_4G | 16); controller->dma_buf_virt = buf->vaddr; controller->dma_buf_phys = buf->paddr.items[0].start; -- 1.6.0.2 From kevin at tyndur.org Sat May 28 14:30:55 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sat, 28 May 2011 14:30:55 +0200 Subject: [tyndur-devel] [PATCH 9/9] ata: Bei Fehlern mehrmals probieren In-Reply-To: <1306585855-30470-1-git-send-email-kevin@tyndur.org> References: <1306585855-30470-1-git-send-email-kevin@tyndur.org> Message-ID: <1306585855-30470-10-git-send-email-kevin@tyndur.org> From: Antoine Kaufmann ! ata: Wenn wir bei Lese-/Schreibfehlern mehr als einmal probieren funktioniert das ganze auch auf echter Hardware etwas zuverlaessiger. Signed-off-by: Antoine Kaufmann Signed-off-by: Kevin Wolf --- src/modules/cdi/ata/ata.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/modules/cdi/ata/ata.c b/src/modules/cdi/ata/ata.c index a2ab78f..262440a 100644 --- a/src/modules/cdi/ata/ata.c +++ b/src/modules/cdi/ata/ata.c @@ -121,6 +121,7 @@ static int ata_drv_rw_sectors(struct ata_device* dev, int direction, void* current_buffer = buffer; uint64_t lba = start; int max_count; + int again = 2; // Anzahl der Sektoren die noch uebrig sind size_t count_left = count; @@ -192,6 +193,10 @@ static int ata_drv_rw_sectors(struct ata_device* dev, int direction, // Request ausfuehren if (!ata_request(&request)) { + if (again) { + again--; + continue; + } result = 0; break; } @@ -200,6 +205,7 @@ static int ata_drv_rw_sectors(struct ata_device* dev, int direction, current_buffer += current_count * ATA_SECTOR_SIZE; count_left -= current_count; lba += current_count; + again = 2; } return result; -- 1.6.0.2