jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-02 15:37:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-settings

Browse Source
This commit is contained in:
Stephan Raue 2013-02-08 22:39:47 +01:00
commit 69960218b2
55 changed files with 9847 additions and 485 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
packages/addons/debugging/tools/evtest/changelog.txt
View File

@ -1,39 +0,0 @@
3.0.1
- bump addon version
2.1.3
- update to evtest-1.30
2.1.2
- cleanup
2.1.1
- rebuild for addon version 2.1
2.0.1
- rebuild for libiconv changes
2.0.0
- prepare for OpenELEC-2.0 release
1.90.1
- depends on xbmc.python API 2.0
1.90.0
- prepare for OpenELEC-1.90 release
1.0.0
- update to evtest-1.29
- prepare for OpenELEC-1.0 release
0.99.3
- change icon
0.99.2
- build as shared lib
- include libiconv libs
- include libxml2 libs
- include zlib libs
0.99.1
- initial addon based on evtest-1.27

BIN
packages/addons/debugging/tools/evtest/icon/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

38
packages/addons/debugging/tools/htop/changelog.txt
View File

@ -1,38 +0,0 @@
3.0.2
- update to htop-1.0.2
3.0.1
- bump addon version
2.1.2
- cleanup
2.1.1
- rebuild for addon version 2.1
- update to htop-1.0.1
2.0.0
- prepare for OpenELEC-2.0 release
- update to htop-1.0
1.90.1
- depends on xbmc.python API 2.0
1.90.0
- prepare for OpenELEC-1.90 release
1.0.0
- prepare for OpenELEC-1.0 release
0.99.4
- change icon
0.99.3
- build as shared lib
- include ncurses libs
0.99.2
- prepare for release
0.99.1
- initial addon based on htop-0.9

BIN
packages/addons/debugging/tools/htop/icon/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

2
packages/addons/service/softcam/oscam/source/bin/oscam.start
View File

@ -91,7 +91,7 @@ if [ ! "$(pidof oscam)" ]; then
# use ". " because of variable export # use ". " because of variable export
. $driver_dvb . $driver_dvb
done done
LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" oscam $OSCAM_ARG > /dev/null 2>&1 LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" exec oscam $OSCAM_ARG > /dev/null 2>&1
sleep 1 sleep 1
done & done &
fi fi

2
packages/addons/service/softcam/oscam/source/bin/oscam.stop
View File

@ -30,6 +30,6 @@ mkdir -p "$LOCKDIR"
touch "$LOCKDIR/$LOCKFILE" touch "$LOCKDIR/$LOCKFILE"
if [ "$(pidof oscam)" ];then if [ "$(pidof oscam)" ];then
killall -9 oscam killall oscam
fi fi

5
packages/debug/acpica/build
View File

@ -26,9 +26,10 @@
[ "$TARGET_ARCH" = "x86_64" ] && ACPICA_BITS="64" [ "$TARGET_ARCH" = "x86_64" ] && ACPICA_BITS="64"
cd $PKG_BUILD cd $PKG_BUILD
make PREFIX=/usr \ make PREFIX=/usr \
CC="$TARGET_CC" \ CC="$TARGET_CC" \
AR="$TARGET_AR" \ AR="$TARGET_AR" \
BITS=$ACPICA_BITS \ BITS=$ACPICA_BITS \
YACC=$ROOT/$TOOLCHAIN/bin/bison YACC=$ROOT/$TOOLCHAIN/bin/bison \
CWARNINGFLAGS="-O2 $TARGET_CFLAGS" \ CWARNINGFLAGS="-O2 $TARGET_CFLAGS"

12
packages/debug/acpica/patches/acpica-unix2-20130117-01-crosscompile.patch Normal file
View File

@ -0,0 +1,12 @@
diff -uNr acpica-unix2-20130117-orig/generate/unix/Makefile.common acpica-unix2-20130117/generate/unix/Makefile.common
--- acpica-unix2-20130117-orig/generate/unix/Makefile.common 2013-01-17 20:47:44.000000000 +0100
+++ acpica-unix2-20130117/generate/unix/Makefile.common 2013-02-07 15:13:59.000000000 +0100
@@ -6,7 +6,7 @@
# Get the OS machine architecture. Anything with a "64" in the returned
# string will be treated as a 64-bit OS. Otherwise, the default is 32-bit.
#
-HARDWARE_NAME := $(shell uname -m)
+HARDWARE_NAME=$(BITS)
BITS=0
#

11
packages/addons/debugging/tools/evtest/addon → packages/debug/cpuid/build
View File

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# This file is part of OpenELEC - http://www.openelec.tv # This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) # Copyright (C) 2013 Dag Wieers (dag@wieers.com)
# #
# This Program is free software; you can redistribute it and/or modify # This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -22,6 +22,9 @@
. config/options $1 . config/options $1
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin cd $PKG_BUILD
cp $PKG_BUILD/evtest $ADDON_BUILD/$PKG_ADDON_ID/bin make PREFIX=/usr \
cp $PKG_BUILD/evtest-capture $ADDON_BUILD/$PKG_ADDON_ID/bin CC="$TARGET_CC" \
AR="$TARGET_AR" \
CFLAGS="$TARGET_CFLAGS" \
CPPFLAGS="$TARGET_CPPFLAGS" \

11
packages/addons/debugging/tools/htop/source/default.py → packages/debug/cpuid/install Normal file → Executable file
View File

@ -1,6 +1,8 @@
#!/bin/sh
################################################################################ ################################################################################
# This file is part of OpenELEC - http://www.openelec.tv # This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) # Copyright (C) 2013 Dag Wieers (dag@wieers.com)
# #
# This Program is free software; you can redistribute it and/or modify # This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -18,6 +20,7 @@
# http://www.gnu.org/copyleft/gpl.html # http://www.gnu.org/copyleft/gpl.html
################################################################################ ################################################################################
import os . config/options $1
import sys
import xbmcaddon mkdir -p $INSTALL/usr/bin/
cp $PKG_BUILD/cpuid $INSTALL/usr/bin/

36
packages/debug/cpuid/meta Normal file
View File

@ -0,0 +1,36 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2013 Dag Wieers (dag@wieers.com)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
PKG_NAME="cpuid"
PKG_VERSION="20120601"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="GPL"
PKG_SITE="http://www.etallen.com/cpuid.html"
PKG_URL="http://www.etallen.com/cpuid/$PKG_NAME-$PKG_VERSION.src.tar.gz"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="system"
PKG_SHORTDESC="cpuid: tool to dump x86 CPUID information"
PKG_LONGDESC="cpuid dumps detailed information about the CPU(s) gathered from the CPUID instruction, and also determines the exact model of CPU(s). It supports Intel, AMD, and VIA CPUs, as well as older Transmeta, Cyrix, UMC, NexGen, Rise, and SiS CPUs."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"

5
packages/debug/dmidecode/install
View File

@ -23,4 +23,7 @@
. config/options $1 . config/options $1
mkdir -p $INSTALL/usr/bin/ mkdir -p $INSTALL/usr/bin/
cp $PKG_BUILD/{biosdecode,dmidecode,ownership,vpddecode} $INSTALL/usr/bin/ cp $PKG_BUILD/biosdecode $INSTALL/usr/bin/
cp $PKG_BUILD/dmidecode $INSTALL/usr/bin/
cp $PKG_BUILD/ownership $INSTALL/usr/bin/
cp $PKG_BUILD/vpddecode $INSTALL/usr/bin/

0
packages/addons/debugging/tools/evtest/build → packages/debug/evtest/build
View File

10
packages/addons/debugging/tools/evtest/source/default.py → packages/debug/evtest/install Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/bin/sh
################################################################################ ################################################################################
# This file is part of OpenELEC - http://www.openelec.tv # This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
@ -18,6 +20,8 @@
# http://www.gnu.org/copyleft/gpl.html # http://www.gnu.org/copyleft/gpl.html
################################################################################ ################################################################################
import os . config/options $1
import sys
import xbmcaddon mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/evtest $INSTALL/usr/bin
cp $PKG_BUILD/evtest-capture $INSTALL/usr/bin

3
packages/addons/debugging/tools/evtest/meta → packages/debug/evtest/meta
View File

@ -32,7 +32,6 @@ PKG_SECTION="debug/tools"
PKG_SHORTDESC="evtest: Simple tool for input event debugging." PKG_SHORTDESC="evtest: Simple tool for input event debugging."
PKG_LONGDESC="evtest is a simple tool for input event debugging." PKG_LONGDESC="evtest is a simple tool for input event debugging."
PKG_IS_ADDON="yes" PKG_IS_ADDON="no"
PKG_ADDON_TYPE="xbmc.python.script"
PKG_AUTORECONF="yes" PKG_AUTORECONF="yes"

0
packages/addons/debugging/tools/evtest/patches/evtest-1.30-automake_1.13.patch → packages/debug/evtest/patches/evtest-1.30-automake_1.13.patch
View File

33
packages/debug/hddtemp/build Executable file
View File

@ -0,0 +1,33 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2013 Dag Wieers (dag@wieers.com)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
cd $PKG_BUILD
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--bindir=/usr/bin \
--with-db-path=/etc/hddtemp.db \
make

523
packages/debug/hddtemp/data/hddtemp.db Normal file
View File

@ -0,0 +1,523 @@
#
# Insert a regular expression for support of the model or the serie of your hard drive.
# If you don't know what to put in the second field, put the number
# that appears most often for your brand :o)
# A value of zero meens that we know that the drive doesn't have
# a temperature sensor (you can set the unit to C or F).
#
############################################################################
# The following list was found at (http://www.almico.com/forumharddisks.php)
# If your drive is in the list send me a mail.
#
# Manufacturer Model Size Notes
# FUJITSU FUJITSU MPF3102AH 10.0GB
# FUJITSU FUJITSU MPG3204AH E 20.0GB
# FUJITSU FUJITSU MPG3307AT 30.0GB
# FUJITSU FUJITSU MPG3409AH 40.0GB
# FUJITSU FUJITSU MPG3409AH EF 40.0GB
# HITACHI HITACHI_DK23CA-10 9.8GB
# HITACHI HITACHI_DK23CA-15 14.7GB
# SAMSUNG SAMSUNG SV3012H 29.4GB
# SEAGATE ST310210A 10.0GB
# SEAGATE ST310211A 9.8GB
# SEAGATE ST310215A 10.0GB
# SEAGATE ST315320A 14.9GB
# SEAGATE ST320410A 19.6GB
# SEAGATE ST320413A 19.6GB
# SEAGATE ST320420A 19.9GB
# SEAGATE ST330610A 29.3GB
# SEAGATE ST330620A 29.3GB
# SEAGATE ST330621A 29.3GB
# SEAGATE ST330630A 29.9GB
# SEAGATE ST340016A 39.1GB
# SEAGATE ST340810ACE 39.1GB
# SEAGATE ST380020ACE 78.2GB
# WESTERN DIGITAL WDC AC210200D 10.0GB
# WESTERN DIGITAL WDC AC29100D 8.9GB
# WESTERN DIGITAL WDC AC420400D 19.9GB
# WESTERN DIGITAL WDC WD102AA 10.0GB
#
#################################################
########################################
############# ExcelStor drives
########################################
# "ExcelStor Technology CT215" ??? ? "ExcelStor CT215"
"ExcelStor Technology J3.0" 194 C "ExcelStor Technology 3xy (xy GB)"
"ExcelStor Technology J6.0" 194 C "ExcelStor Technology 6xy (xy GB)"
"ExcelStor Technology J680" 194 C "ExcelStor Technology J680 (80 GB)"
"ExcelStor Technology J860" 194 C "ExcelStor Technology J860 (60 GB)"
"ExcelStor Technology J880" 194 C "ExcelStor Technology J880 (80 GB)"
########################################
############# Fujitsu drives
########################################
"FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT"
"FUJITSU MHN2150AT" 194 C "Fujitsu MHN2150AT"
"FUJITSU MHN2200AT" 194 C "Fujitsu MHN2200AT"
"FUJITSU MHN2300AT" 194 C "Fujitsu MHN2300AT"
"FUJITSU MHR2020AT" 194 C "Fujitsu MHR2020AT"
"FUJITSU MHR2030AT" 194 C "Fujitsu MHR2030AT"
"FUJITSU MHS2030AT" 194 C "Fujitsu MHS2030AT"
"FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT"
"FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)"
"FUJITSU MHT2030AC" 194 C "Fujitsu Mobile 30GB, 2MB, 4200RPM (automotive)"
"FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT"
"FUJITSU MHT2040AH" 194 C "Fujitsu MHT2040AH"
"FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT"
"FUJITSU MHT2060AH" 194 C "Fujitsu MHT2060AH"
"FUJITSU MHT2060AT" 194 C "Fujitsu MHT2060AT"
"FUJITSU MHT2080AH" 194 C "Fujitsu MHT2080AH"
"FUJITSU MHU2100AT" 194 C "Fujitsu MHU2100AT 100GB, 8MB (4200RPM)"
"FUJITSU MHV2100AH" 194 C "FUJITSU MHV2100AH"
"FUJITSU MHV2100AT" 194 C "FUJITSU MHV2100AT"
"FUJITSU MHV2080[AB]H" 194 C "FUJITSU MHV2080AH"
"FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH"
"FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT"
"FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT"
"FUJITSU MPG3409AT.*" 194 C "Fujitsu MPG3409AT E"
"FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E"
"FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH"
"FUJITSU MPG3102AT E" 194 C "FUJITSU MPG3102AT E"
########################################
############# Hitachi drives
########################################
"HITACHI_DK13FA-40B" 194 C "Hitachi DK13FA-40B"
"HITACHI_DK228A-65" 0 C "Hitachi DK228A-65"
"HITACHI_DK23CA-(15|20|30|30B|75)" 194 C "Hitachi DK23CA series"
"HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series"
"HITACHI_DK23EA-[2346]0" 194 C "Hitachi DK23EA series"
"HITACHI_DK23EB-40" 194 C "Hitachi DK23EB series"
"HITACHI_DK23FA-[468]0" 194 C "Hitachi DK23FA series"
"HITACHI_DK23FB-[46]0" 194 C "Hitachi DK23FB series"
"HDS722516VLAT[28]0" 194 C "Hitachi Deskstar 7K250 160GB 2/8MB cache"
"HDS722525VLAT80" 194 C "Hitachi Deskstar 7K250 200/250GB, 7200RPM, 8MB, Parallel-ATA"
"HDS722512VLAT80" 194 C "Hitachi Deskstar 7K250 80GB"
"HDS722540VLAT20" 194 C "Hitachi Deskstar 7K250, 40GB, 7200RPM, 2MB cache"
"HDS722580VLAT20" 194 C "Deskstar 7K250 60GB"
"HDS724040KLSA80" 194 C "Hitachi Deskstar 7K250 400GB, 7200RPM, 8MB, Serial-ATA"
"HDS728080PLAT20" 194 C "Hitachi Deskstar 7K80 80GB"
"HDS722525VLSA80" 194 C "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, SATA"
"HDS722516VLSA80" 194 C "Hitachi Deskstar 7K250 160GB 8Mo cache SATA"
"HDS722580VLSA80" 194 C "Hitachi Deskstar 7K250 80GB SATA"
"HDS728040PLAT20" 194 C "Hitachi Deskstar 7K80 40GB"
"HDS724040KLAT80" 194 C "Hitachi Deskstar 7K400 400GB 8Mo cache PATA"
"HDT7225(16|25)DLAT80" 194 C "Hitachi Deskstar T7K250 series, 7200RPM, 8MB, PATA"
"HDT722516DLA380 V43O" 194 C "Hitachi T7K250 SATA"
"HDT722525DLA380" 194 C "Hitachi Deskstar T7K250 250GB 8Mo cache SATAII"
"HDT725050VLA360" 194 C "Hitachi Deskstar T7K500 500GB, 7200RPM, 16MB, SATA II"
"HTE721010G9AT00" 194 C "Hitachi Travelstar 100GB (7200RPM)"
"HTE726060M9AT00" 194 C "Hitachi Travelstar 60GB (7200RPM)"
"HTS424030M9AT00" 194 C "Hitachi Travelstar 30GB (4200RPM)"
"HTS424040M9AT00" 194 C "Hitachi Travelstar 4K40 40GB 2MB cache (4200RPM)"
"HTS541010G9SA00" 194 C "Hitachi Travelstar 100GB SATA"
"HTS541040G9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)"
"HTS541080G9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)"
"HTS548020M9AT00" 194 C "Hitachi Travelstar 20GB (5400RPM)"
"HTS548030M9AT00" 194 C "Hitachi Travelstar 30GB (5400RPM)"
"HTS548040M9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)"
"HTS548060M9AT00" 194 C "Hitachi Travelstar 60GB (5400RPM)"
"HTS548080M9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)"
"HTS721080G9AT00" 194 C "Hitachi Travelstar 7K100 80GB (7200RPM)"
"HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB"
########################################
############# IBM drives
########################################
# DJSA serie is using F0h command to report temperature and also have
# SMART capabilties but it was reported not to work.
# "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series"
"IBM-DARA-212000" 0 C "IBM Travelstar 12GN"
"IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie"
# according to specifications they do not seems to have sensor
# but I prefer waiting for a report
#"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie"
"IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie"
"IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie"
"IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie"
"IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie"
"IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie"
"IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie"
"IBM-DTLA-30[57]0[123467][05]" 194 C "IBM Deskstar 40GV & 75GXP series"
"IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie"
"IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie"
"IC25N0(10|15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie"
"IC25N0[23468]0ATMR04*" 194 C "Hitachi Travelstar 80GN"
"IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie"
"IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie"
"IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie"
"IC35L[01][02468]0AVV[AN]07*" 194 C "IBM Deskstar 120GXP serie"
"IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie"
########################################
############# Maxtor drives
########################################
#"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX"
"Maxtor 2F0[234]0[LJ]0" 194 C "Maxtor Fireball 3"
# which one must I trust ?
#"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D"
#"Maxtor 4D040H2" 0 C "Maxtor 4D040H2"
#"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D"
#"Maxtor 4D060H3" 12 C "Maxtor DiamondMax D540X-4D"
#"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D"
"MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie"
"MAXTOR 4K020H1" 194 C "Maxtor 4K020H1"
"Maxtor 4A300J0" 194 C "Maxtor MaxLine II 300GB 5400RPM"
"Maxtor 4[RA](25|16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16"
"Maxtor 5(1024|1369|2049|2732|3073|4098)U(2|3|4|6|8)" 0 C "Maxtor DiamondMax Plus 40"
"Maxtor 5A250J0" 194 C "Maxtor MaXline II 250GB 5400RPM"
"Maxtor 5A300J0" 194 C "Maxtor 5A300J0"
"Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60"
"Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8"
"MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family"
"Maxtor 6V320F0" 194 C "Maxtor Diamond Max 10 SATA II 320 GB"
"Maxtor 6Y(06|08|12|16|20|25)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9"
"Maxtor 7L300[RS]0" 194 C "Maxtor 7L300R0 MaxLine+III 300GB 7200rpm"
"Maxtor 7Y250[PM]0" 194 C "Maxtor MaXLine Plus II 250GB 7200RPM"
"Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8"
#"Maxtor 6(B|L)(08|12|16|20|25|30)0[RSPM]0" 194 C "Maxtor DiamondMax Plus 10"
"Maxtor 6B080M0" 194 C "Maxtor DiamondMax 10 80GB 8MB SATA"
"Maxtor 6B120M0" 194 C "Maxtor DiamondMax 10 120GB 8MB SATA"
"Maxtor 6B160M0" 194 C "Maxtor DiamondMax 10 160GB 8MB SATA"
"Maxtor 6B160P0" 194 C "Maxtor DiamondMax 10 160GB 8MB ATA/133"
"Maxtor 6B200M0" 194 C "Maxtor DiamondMax 10 200GB 8MB SATA"
"Maxtor 6B200P0" 194 C "Maxtor DiamondMax 10 200GB 8MB ATA/133"
"Maxtor 6B250R0" 194 C "Maxtor DiamondMax 10 250GB 16MB ATA/133"
"Maxtor 6B250S0" 194 C "Maxtor DiamondMax 10 250GB 16MB SATA"
"Maxtor 6B300R0" 194 C "Maxtor DiamondMax 10 300GB 16MB ATA/133"
"Maxtor 6B300S0" 194 C "Maxtor DiamondMax 10 300GB 16MB SATA"
"Maxtor 6L080L0" 194 C "Maxtor DiamondMax 10 80GB 2MB ATA/133 RoHS"
"Maxtor 6L080M0" 194 C "Maxtor DiamondMax 10 80GB 8MB SATA RoHS"
"Maxtor 6L080P0" 194 C "Maxtor DiamondMax 10 80GB 8MB ATA/133 RoHS"
"Maxtor 6L120M0" 194 C "Maxtor DiamondMax 10 120GB 8MB SATA RoHS"
"Maxtor 6L120P0" 194 C "Maxtor DiamondMax 10 120GB 8MB ATA/133 RoHS"
"Maxtor 6L160M0" 194 C "Maxtor DiamondMax 10 160GB 8MB SATA RoHS"
"Maxtor 6L160P0" 194 C "Maxtor DiamondMax 10 160GB 8MB ATA/133 RoHS"
"Maxtor 6L200M0" 194 C "Maxtor DiamondMax 10 200GB 8MB SATA RoHS"
"Maxtor 6L200P0" 194 C "Maxtor DiamondMax 10 200GB 8MB ATA/133 RoHS"
"Maxtor 6L250R0" 194 C "Maxtor DiamondMax 10 250GB 16MB ATA/133 RoHS"
"Maxtor 6L250S0" 194 C "Maxtor DiamondMax 10 250GB 16MB SATA RoHS"
"Maxtor 6L300R0" 194 C "Maxtor DiamondMax 10 300GB 16MB ATA/133 RoHS"
"Maxtor 6L300S0" 194 C "Maxtor DiamondMax 10 300GB 16MB SATA RoHS"
"Maxtor 6V080E0" 194 C "Maxtor DiamondMax 10 80GB 8MB SATAII RoHS"
"Maxtor 6V160E0" 194 C "Maxtor DiamondMax 10 160GB 8MB SATAII RoHS"
"Maxtor 6V200E0" 194 C "Maxtor DiamondMax 10 200GB 8MB SATAII RoHS"
"Maxtor 6V250F0" 194 C "Maxtor DiamondMax 10 250GB 16MB SATAII RoHS"
"Maxtor 6V300F0" 194 C "Maxtor DiamondMax 10 300GB 16MB SATAII RoHS"
########################################
############# Quantum drives
########################################
"QUANTUM FIREBALLP AS40.0" 0 C "Quantum Fireball AS40"
"QUANTUM FIREBALL CX10.2A" 0 C "Quantum Fireball CX10.2A"
#"QUANTUM FIREBALLlct10 20" 4 C "Quantum Fireball CT10 20GB"
# I suspect the QUANTUM FIREBALL_TM2110A to have a sensor in field 9...
# "QUANTUM FIREBALL_TM2110A" 9 C "Quantum Fireball TM2110A"
########################################
############# Samsung drives
########################################
# somenone reported a problem with the SP8004H which reports a temperature
# 10°C below the ambient temperature
"SAMSUNG HA(200|250)JC" 194 C "Samsung SpinPoint V120CE series"
"SAMSUNG HD160JJ" 194 C "Samsung 160GB, 7200RPM, 8MB cache, SATA"
"SAMSUNG HD160JJ/P" 194 C "Samsung SpinPoint P80 SD 160GB (7200RPM, 8MB cache)"
"SAMSUNG HD[30|32|40][01]L[DJ]" 194 C "Samsung SpinPoint T133 series (300-400MB)"
"SAMSUNG HD250KD" 194 C "Samsung SpinPoint T133 series (250 MB PATA)"
"SAMSUNG HD321KJ" 194 C "Samsung Spinpoint T166 (7200RPM, 16MB cache) - SATA"
"SAMSUNG HD501LJ" 194 C "Samsung HD501LJ"
"SAMSUNG MP0(302|402|603|804)H" 194 C "Samsung SpinPoint M40 2.5inch"
"SAMSUNG SW0434A" 0 C "Samsung SW0434A"
"SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie"
"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie"
"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)C" 194 C "Samsung SpinPoint P80 series - SATA"
"SAMSUNG SP0411N" 194 C "Samsung SpinPoint PL40 serie"
"SAMSUNG SP0822N" 194 C "Samsung SP0822N"
"SAMSUNG SP(0812|1213|1614)C" 194 C "Samsung Spinpoint 160G SATA"
"SAMSUNG SP2[05]14N" 194 C "Samsung SpinPoint P120 series (7200RPM, 8MB cache)"
"SAMSUNG SP2[05]04C" 194 C "Samsung SpinPoint P120 series - SATA"
"SAMSUNG SV0432A" 0 C "Samsung SV0432A"
"SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie"
"SAMSUNG SV(2001|4002|4012|6003|8004)H" 194 C "Samsung SpinPoint V40 serie"
#"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie"
#"SAMSUNG SV1204H" 194 C "Samsung 120G"
"SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie"
"SAMSUNG SV4012H" 194 C "Samsung 40GB, 5400RPM, 2MB cache"
########################################
############# Seagate drives
########################################
"Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A"
"ST3412A" 0 C "Seagate ST3412A"
"ST38641A" 0 C "Seagate ST38641A"
"ST310014A" 194 C "Seagate ST310014A"
"ST310210A" 0 C "Seagate ST310210A"
"ST310211A" 194 C "Seagate ST310211A"
"ST310220A" 0 C "Seagate ST310220A"
# SEAGATE ST313021A 13.0GB
"ST313021A" 0 C "Seagate U8 ST313021A"
"ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3"
"ST315320A" 194 C "Seagate ST315320A"
"ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66"
"ST320011A" 194 C "Seagate ST320011A"
"ST320014A" 194 C "Seagate ST320014A (5400 rpm, 20Gb)"
"ST320410A" 194 C "Seagate ST320410A"
"ST320413A" 194 C "Seagate ST320413A"
"ST320414A" 194 C "Seagate ST320414A"
"ST320420A" 194 C "Seagate Barracuda II ST320420A"
"ST330013A" 194 C "Seagate ST330013A Barracuda ATA V 30GB, 7200 rpm"
"ST330620A" 194 C "Seagate ST330620A"
"ST330621A" 194 C "Seagate ST330621A"
"ST330630A" 194 C "Seagate Barracuda ST330630A"
"ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb"
"ST340015A" 194 C "Seagate Barracuda 5400.1 40GB"
"ST340016A" 194 C "Seagate ST340016A"
"ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)"
"ST340823A" 194 C "Seagate U Series 5 40823"
"ST340824A" 194 C "Seagate Barracuda III"
"ST360015A" 194 C "Seagate Barracuda V ST360015A"
"ST360020A" 194 C "Seagate U Series 60020"
"ST360021A" 194 C "Seagate Barracuda IV ST360021A"
"ST380011A" 194 C "Seagate Barracuda 7200.7 80GB"
"ST380012A" 194 C "Seagate ST380012A 80GB"
"ST380013A" 194 C "Seagate Barracuda 7200.7 80GB"
"ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)"
"ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)"
"ST380021A" 194 C "Seagate Barracuda IV ST380021A"
"ST380022A" 194 C "Seagate Barracuda U7 80022, Ultra ATA/100"
"ST380023A" 194 C "Seagate Barracuda V ST380023A"
"ST380817AS" 194 C "Seagate Barracuda 7200.7 80GB - SATA"
"ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)"
"ST3120020A" 194 C "Seagate ST3120020A"
"ST3120022A" 194 C "Seagate Baraccuda 7200.7 120GB"
"ST3120023A" 194 C "Seagate Barracuda V ST3120023A"
"ST3120024A" 194 C "Seagate Barracuda V ST3120024A"
"ST3120025ACE" 194 C "Seagate Barracuda V ST3120025ACE"
"ST3120026A" 194 C "Seagate Barracuda V ST3120026A"
"ST3160021A" 194 C "Seagate Barracuda 7200.7 - ST3160021A"
"ST3160023(A|AS)" 194 C "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 or Serial ATA)"
"ST3160827AS" 194 C "Seagate Barracuda 7200.7 160GB (Serial ATA)"
"ST3200021A" 194 C "Seagate Barracuda 7200.7 Plus 200GB"
"ST3200822(A|AS)" 194 C "Seagate Barracuda 7200.7 Plus 200GB (PATA or SATA)"
"ST3200826A" 194 C "Seagate Barracuda 7200.8 200Gb"
"ST3250623A" 194 C "Seagate Barracuda 7200.16 250GB"
"ST3250823A" 194 C "Seagate Barracuda 7200.8 250GB"
"ST3250823A" 194 C "Seagate Barracuda 7200.7 Plus 250GB"
"ST3250823NS" 194 C "Seagate NL35 SATA (RAID-Edition) 7200 250GB"
"ST3300831A" 194 C "Seagate 300GB ST3300831A"
"ST3400832A" 194 C "Seagate Barracuda 7200.8 Plus 400GB"
"ST3400633(A|AS)" 194 C "Seagate Barracuda 7200.7 400 GB"
"ST3500630NS" 194 C "Seagate"
"ST3400632NS" 194 C "Seagate"
"ST3320620AS" 194 C "Seagate Barracuda 7200.7 320 GB"
"ST3500630AS" 194 C "Seagate Barracuda 7200.7 500 GB"
"ST3802110A" 194 C "Seagate Barracuda 7200.9 80 GB"
"ST910021A" 194 C "Seagate Momentus 7200.1 100GB"
"ST910082[35]A" 194 C "Seagate Momentus 5400.2 100GB"
"ST9120821A" 194 C "Seagate Momentus 5400.2 120GB"
"ST94019A" 194 C "Seagate ST94019A"
"ST94813A" 194 C "Seagate Momentus 5400.2 40GB"
"ST94[08]11A" 194 C "Seagate ST94011A"
"ST960821A" 194 C "Seagate ST960821A"
"ST960822A" 194 C "Seagate Momentus 5400.2 60GB"
"ST96812AS" 194 C "Seagate Momentus 5400.2 60GB SATA"
"ST9808211A" 194 C "Seagate Momentus 5400.2 80GB"
########################################
############# TOSHIBA Laptops
########################################
"MK4313MAT" 220 C "Toshiba MK4313MAT"
"TOSHIBA MK1032GAX" 194 C "Toshiba MK1032GAX"
"TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP"
"TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS"
"TOSHIBA MK2023GAS" 194 C "Toshiba MK2023GAS"
"TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP"
"TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS"
"TOSHIBA MK3025GAS" 194 C "Toshiba MK3025GAS"
#"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX"
"TOSHIBA MK4021GAS" 194 C "Toshiba MK4021GAS"
"TOSHIBA MK4025GAS" 194 C "Toshiba MK4025GAS 40 Go"
"TOSHIBA MK4026GAS" 194 C "Toshiba MK4026GAS 40 Go"
"TOSHIBA MK4032GAX" 194 C "Toshiba MK4032GAX"
"TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS"
"TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX"
"TOSHIBA MK6025GAS" 194 C "Toshiba MK6025GAS"
"TOSHIBA MK6026GAX" 194 C "Toshiba MK6026GAX"
"TOSHIBA MK8025GAS" 194 C "Toshiba MK8025GAS"
"TOSHIBA MK8026GAX" 194 C "Toshiba MK8026GAX"
"MK4025GAS" 194 C "Toshiba MK4025GAS"
########################################
############# Western Digital drives
########################################
# WDC AC310100B and WDC AC2850F are reported not working
# no more informations were given
"WDC AC22000L" 0 C "Western Digital Caviar AC22000"
"WDC AC420400D" 231 C "Western Digital Caviar AC420400D"
"WDC AC418000D" 231 C "Western Digital AC418000D"
"WDC WD135BA" 231 C "Western Digital WD135BA"
"WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0"
"WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB"
#"WDC WD200BB-60DGA0" 0 C "Western Digital Caviar WD200BB"
"WDC WD300BB-00CAA0" 0 C "Western Digital WD300BB"
"WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB"
"WDC WD400BB-00CAA0" 0 C "Western Digital 400BB-00CAA0"
"WDC WD400BB-00J[KH]A0" 194 C "Western Digital Caviar WD400BB"
"WDC WD400BB-23JHC0" 194 C "Western Digital 23JHC0"
#"WDC WD400BB-00GFA0" 0 C ""
"WDC WD400BB-55HEA0" 194 C "Western Digital Caviar WD400BB"
"WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB"
"WDC WD400BB-75FJA1" 194 C "Western Digital Caviar WD400BB"
"WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0"
"WDC WD400JB-00(JJ|FM|FS)A0" 194 C "Western Digital Caviar 40GB Special Edition 8MB"
"WDC WD400JB-00ETA0" 194 C "Western Digital 400JB-00ETA0"
"WDC WD400JB-00JJC0" 194 C "Western Digital 400JB-00JJC0 40GB"
"WDC WD400LB-00DNA0" 194 C "Western Digital 400LB-00DNA0"
"WDC WD400UE-22HCT0" 194 C "Western Digital 40GB Notebook HDD"
"WDC WD400VE-75HDT1" 194 C "Western Digital Scorpio 40GB"
"WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0"
"WDC WD600JB-00ETA0" 194 C "Western Digital 600JB-00ETA0"
"WDC WD600LB-00DNA0" 194 C "Western Digital 60GB"
"WDC WD600VE-75HDT0" 194 C "Western Digital 600VE-75HDT0"
"WDC WD600VE-00HDT0" 194 C "Western Digital 600VE-00HDT0"
"WDC WD740GD-00FL21.0" 194 C "Western Digital SATA Raptor"
"WDC WD740GD-([05]0FL[AC]0|75FLA1)" 194 C "Western Digital SATA Raptor 74GB 8MB"
"WDC WD800BB-00CAA1" 0 C "Western Digital WD800BB-00CAA1"
"WDC WD800BB-(00|22)DKA0" 194 C "Western Digital WD800BB 80 Go"
"WDC WD800BB-32CCB0" 194 C "Western Digital 800BB-32CCB0"
"WDC WD800BB-55HEA0" 194 C "Western Digital 800BB-55HEA0"
"WDC WD800BB-00JHA0" 194 C "Western Digital 800BB-00JHA0"
"WDC WD800BB-00JKA0" 194 C "Western Digital 800BB-00JKA0"
"WDC WD800BB-55JKA0" 194 C "Western Digital 800BB-55JKA0"
"WDC WD800BB-75FRA0" 194 C "Western Digital Caviar WD800BB"
"WDC WD800JB-00CRA1" 0 C "Western Digital Caviar WD800JB"
"WDC WD800JB-00(ET|FM|FS)A0" 194 C "Western Digital Caviar 80GB Special Edition 8MB"
"WDC WD800JB-00JJ[AC]0" 194 C "Western Digital WD800JB"
"WDC WD800JD-(00|55)(HK|JR)A0" 194 C "Western Digital SATA 80GB, 8MB Cache"
"WDC WD800JD-00(HK|JN)A0" 194 C "Western Digital SATA 80GB, 8MB Cache"
"WDC WD800LB-(00|55)DNA0" 194 C "Western Digital Caviar WD800LB 80 Go ATA-100"
"WDC WD800VE-07HDT0" 194 C "Western Digital 800VE-07HDT0"
"WDC WD1200BB-00(FTA|GUA)0" 194 C "Western Digital Caviar EIDE 2MB Cache"
"WDC WD1200JB-00(EV|FU|GV)A0" 194 C "Western Digital Caviar 120GB Special Edition 8MB"
"WDC WD1200JB-22GVA0" 194 C "Western Digital Caviar 120GB"
"WDC WD1200JD-00(GBB|HBC)0" 194 C "Western Digital WD1200JD"
"WDC WD1200LB-55EDA0" 194 C "Western Digital WD1220LB"
"WDC WD1200SB-01KB[AC]0" 194 C "Western Digital Caviar RE (Raid Edition) 120 GB"
"WDC WD1600BB-00DWA0" 194 C "Western Digital Caviar WD1600BB"
"WDC WD1600JB-(00EV|00FU|00GV|22GV|75GV)A0" 194 C "Western Digital Caviar 160GB Special Edition 8MB"
"WDC WD2000BB-00FTA0" 194 C "Western Digital WD2000BB"
"WDC WD2000JB-(00EV|32EV|34EV|00FU|00GV|55GV|98GV|00KF)A0" 194 C "Western Digital Caviar 200GB Special Edition 8MB"
"WDC WD2000JB-00GVC0" 194 C "Western Digital WD2000JB"
"WDC WD2000JS-00MHB1" 194 C "Western Digital SATA 200GB"
"WDC WD2500JB-(00RE|00EV|00FU|32FU|00GV|55GV)A0" 194 C "Western Digital Caviar 250GB Special Edition 8MB"
"WDC WD2500JB-00GVC0" 194 C "Western Digital 250GB"
"WDC WD2500JD-(00G|32H)BB0" 194 C "Western Digital SATA Caviar 250GB Special Edition 8MB"
"WDC WD2500JD-40HBC0" 194 C "Western Digital WD2500JD-40HBC0"
"WDC WD2500PB-98FBA0" 194 C "Western Digital Caviar 250GB Special Edition 8MB"
"WDC WD2500PD-00FZB1" 194 C "Western Digital WD2500PD-00FZB1"
"WDC WD2500SD-01KCB0" 194 C "Western Digital Caviar RE 250GB 8MB"
"WDC WD3000JB-00KFA0" 194 C "Western Digital WD3000JB"
"WDC WD3200JB-00KFA0" 194 C "Western Digital Caviar 320GB 8MB"
"WDC WD4000KD-00NAB0" 194 C "Western Digital Caviar SE16 400GB 16MB"
"WDC WD4000YR-01PLB0" 194 C "Western Digital Caviar RE2 400GB 16MB"
"WD4000YS-01MPB0" 194 C "Western Digital RE2 7200 SATA II 400 GB"
# not sure for next
# "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1"
# "WDC WD273BA" 9 C "Western Digital WD273BA"
########################################################################################################################
########################################################################################################################
########################################################################################################################
########################################################################################################################
########################################################################################################################
########################################################################################################################
########################################################################################################################
########################################################################################################################
########################################################################################################################
########################################################################################################################
########################################################################################################################
########################################################################################################################
########################################################################################################################
########################################################################################################################
"ST3750640AS" 194 C "Seagate Barracuda 7200.10 SATA 750GB"
"ST3750840AS" 194 C "Seagate Barracuda 7200.10 SATA 750GB"
"ST3500630AS" 194 C "Seagate Barracuda 7200.10 SATA 500GB"
"ST3500830AS" 194 C "Seagate Barracuda 7200.10 SATA 500GB"
"ST3400620AS" 194 C "Seagate Barracuda 7200.10 SATA 400GB"
"ST3400620A" 194 C "Seagate Barracuda 7200.10 400GB"
"ST3400820AS" 194 C "Seagate Barracuda 7200.10 SATA 400GB"
"ST3320620AS" 194 C "Seagate Barracuda 7200.10 SATA 320GB"
"ST3320820AS" 194 C "Seagate Barracuda 7200.10 SATA 320GB"
"ST3300620AS" 194 C "Seagate Barracuda 7200.10 SATA 300GB"
"ST3300820AS" 194 C "Seagate Barracuda 7200.10 SATA 300GB"
"ST3250620AS" 194 C "Seagate Barracuda 7200.10 SATA 250GB"
"ST3250820AS" 194 C "Seagate Barracuda 7200.10 SATA 250GB"
"ST3250410AS" 194 C "Seagate Barracuda 7200.10 SATA 250GB"
"ST3250310AS" 194 C "Seagate Barracuda 7200.10 SATA 250GB"
"ST3200820AS" 194 C "Seagate Barracuda 7200.10 SATA 200GB"
"ST3160815AS" 194 C "Seagate Barracuda 7200.10 SATA 160GB"
"ST3160215AS" 194 C "Seagate Barracuda 7200.10 SATA 160GB"
"ST3120815AS" 194 C "Seagate Barracuda 7200.10 SATA 120GB"
"ST3120215AS" 194 C "Seagate Barracuda 7200.10 SATA 120GB"
"ST380815AS" 194 C "Seagate Barracuda 7200.10 SATA 80GB"
"ST380215AS" 194 C "Seagate Barracuda 7200.10 SATA 80GB"
"ST340815AS" 194 C "Seagate Barracuda 7200.10 SATA 40GB"
"ST340215AS" 194 C "Seagate Barracuda 7200.10 SATA 40GB"
"ST3300622AS" 194 C "Seagate Barracuda 7200.9 SATA2.5 300GB"
"ST3300831A" 194 C "Seagate Barracuda 7200.8 PATA 300GB"
"Maxtor 7(L|V)250(F|R|S)0" 194 C "Maxtor MaXLine III 250GB 7200rpm"
"Maxtor 7(L|V)300(F|R|S)0" 194 C "Maxtor MaXLine III 300GB 7200rpm"
"MAXTOR STM3320620AS" 194 C ""
"WDC WD1500ADFD-00NLR1" 194 C "Western Digital Raptor 150GB"
"WDC WD1600JS-00NCB1" 194 C "Western Digital Caviar 1600JS 160GB Sata"
"WDC WD1600SD-01KCC0" 194 C "Western Digital Caviar RE Serial ATA series"
"WDC WD2500JD-57HBC0" 194 C "Western Digital Caviar SE (Serial ATA) 250 GB"
"WDC WD2500JS" 194 C "Western Digital WD2500JS"
"WDC WD2500JS-41MVB1" 194 C "Western Digital SATAII Caviar 250GB Special Edition 8MB"
"WDC WD2500JD-00HBB0" 194 C "Western Digital SATA 250GB"
"WDC WD2500KS-00MJB0" 194 C "Western Digital SATA-II Caviar 250GB Special Edition 16MB"
"WDC WD3000JS-00PDB0" 194 C "Western Digital WD3000JS"
"WDC WD3200KS-00PFB0" 194 C ""
"WDC WD3200JD-22KLB0" 194 C "Western Digital Caviar SE 320GB 8MB"

29
packages/debug/hddtemp/install Executable file
View File

@ -0,0 +1,29 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2013 Dag Wieers (dag@wieers.com)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
mkdir -p $INSTALL/etc/
cp $PKG_DIR/data/hddtemp.db $INSTALL/etc/
mkdir -p $INSTALL/usr/bin/
cp $PKG_BUILD/src/hddtemp $INSTALL/usr/bin/

36
packages/debug/hddtemp/meta Normal file
View File

@ -0,0 +1,36 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2013 Dag Wieers (dag@wieers.com)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
PKG_NAME="hddtemp"
PKG_VERSION="0.3-beta15"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.guzu.net/linux/hddtemp.php"
PKG_URL="http://download.savannah.gnu.org/releases/hddtemp/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="system"
PKG_SHORTDESC="hddtemp: tool that reports hard drive temperature"
PKG_LONGDESC="hddtemp is a small utility (daemonizable) that gives you the temperature of your hard drive by reading S.M.A.R.T. informations (for drives that support this feature)."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"

7539
packages/debug/hddtemp/patches/hddtemp_0.3-beta15-52.diff Normal file
View File

File diff suppressed because it is too large Load Diff

30
packages/debug/hddtemp/unpack Executable file
View File

@ -0,0 +1,30 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2013 Dag Wieers (dag@wieers.com)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
echo "### Applying upstream patches ###"
for patch in `ls $PKG_DIR/patches/*.diff`; do
cat $patch | patch -d \
`echo $BUILD/$PKG_NAME-$PKG_VERSION | cut -f1 -d\ ` -p1
done

0
packages/addons/debugging/tools/htop/build → packages/debug/htop/build
View File

4
packages/addons/debugging/tools/htop/addon → packages/debug/htop/install
View File

@ -22,5 +22,5 @@
. config/options $1 . config/options $1
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/htop $ADDON_BUILD/$PKG_ADDON_ID/bin cp $PKG_BUILD/htop $INSTALL/usr/bin

5
packages/addons/debugging/tools/htop/meta → packages/debug/htop/meta
View File

@ -20,7 +20,7 @@
PKG_NAME="htop" PKG_NAME="htop"
PKG_VERSION="1.0.2" PKG_VERSION="1.0.2"
PKG_REV="2" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://htop.sourceforge.net/" PKG_SITE="http://htop.sourceforge.net/"
@ -32,7 +32,6 @@ PKG_SECTION="debug/tools"
PKG_SHORTDESC="htop: Htop is an ncurses based interactive process viewer for Linux." PKG_SHORTDESC="htop: Htop is an ncurses based interactive process viewer for Linux."
PKG_LONGDESC="Htop is an ncurses based interactive process viewer for Linux." PKG_LONGDESC="Htop is an ncurses based interactive process viewer for Linux."
PKG_IS_ADDON="yes" PKG_IS_ADDON="no"
PKG_ADDON_TYPE="xbmc.python.script"
PKG_AUTORECONF="yes" PKG_AUTORECONF="yes"

5
packages/debug/i2c-tools/install
View File

@ -23,5 +23,8 @@
. config/options $1 . config/options $1
mkdir -p $INSTALL/usr/bin/ mkdir -p $INSTALL/usr/bin/
cp $PKG_BUILD/tools/{i2cdetect,i2cdump,i2cget,i2cset} $INSTALL/usr/bin/ cp $PKG_BUILD/tools/i2cdetect $INSTALL/usr/bin/
cp $PKG_BUILD/tools/i2cdump $INSTALL/usr/bin/
cp $PKG_BUILD/tools/i2cget $INSTALL/usr/bin/
cp $PKG_BUILD/tools/i2cset $INSTALL/usr/bin/
cp $PKG_BUILD/stub/i2c-stub-from-dump $INSTALL/usr/bin/ cp $PKG_BUILD/stub/i2c-stub-from-dump $INSTALL/usr/bin/

2
packages/debug/meta
View File

@ -25,7 +25,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://www.openelec.tv" PKG_SITE="http://www.openelec.tv"
PKG_URL="" PKG_URL=""
PKG_DEPENDS="acpica strace gdb dmidecode i2c-tools pmtools" PKG_DEPENDS="acpica cpuid dmidecode evtest gdb hddtemp htop i2c-tools pmtools powertop strace"
PKG_BUILD_DEPENDS="toolchain" PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional" PKG_PRIORITY="optional"
PKG_SECTION="debug" PKG_SECTION="debug"

46
packages/debug/powertop/build Executable file
View File

@ -0,0 +1,46 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2013 Dag Wieers (dag@wieers.com)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
export CXXFLAGS="$CXXFLAGS -I$SYSROOT_PREFIX/usr/include/ncurses"
export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/ncurses"
export LIBS="-ltinfo"
export LDFLAGS="$LDFLAGS -ltinfo"
cd $PKG_BUILD
ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes \
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--bindir=/usr/bin \
make V=1 CC="$HOST_CC" \
CFLAGS="$HOST_CFLAGS" \
LDFLAGS="$HOST_LDFLAGS" \
LIBS="" \
AM_LDFLAGS="" \
-C src csstoh
make V=1

26
packages/debug/powertop/install Executable file
View File

@ -0,0 +1,26 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2013 Dag Wieers (dag@wieers.com)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
mkdir -p $INSTALL/usr/bin/
cp $PKG_BUILD/src/powertop $INSTALL/usr/bin/

36
packages/debug/powertop/meta Normal file
View File

@ -0,0 +1,36 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2013 Dag Wieers (dag@wieers.com)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
PKG_NAME="powertop"
PKG_VERSION="2.2"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://01.org/powertop/"
PKG_URL="https://01.org/powertop/sites/default/files/downloads/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS="ncurses pciutils libnl"
PKG_BUILD_DEPENDS="toolchain ncurses pciutils libnl"
PKG_PRIORITY="optional"
PKG_SECTION="system"
PKG_SHORTDESC="powertop: tool to diagnose issues with power consumption and power management"
PKG_LONGDESC="PowerTOP is a Linux tool to diagnose issues with power consumption and power management. In addition to being a diagnostic tool, PowerTOP also has an interactive mode where the user can experiment various power management settings for cases where the Linux distribution has not enabled these settings."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"

2
packages/mediacenter/xbmc-theme-Confluence/meta
View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc-theme-Confluence" PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="12.0" PKG_VERSION="12.0.1"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

1
packages/mediacenter/xbmc/build
View File

@ -265,7 +265,6 @@ cd $PKG_BUILD
--exec-prefix=/usr \ --exec-prefix=/usr \
--sysconfdir=/etc \ --sysconfdir=/etc \
--datadir=/usr/share \ --datadir=/usr/share \
GIT_REV=`cat git.version` \
--disable-debug \ --disable-debug \
--disable-optimizations \ --disable-optimizations \
$XBMC_OPENGL \ $XBMC_OPENGL \

2
packages/mediacenter/xbmc/meta
View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc" PKG_NAME="xbmc"
PKG_VERSION="12.0" PKG_VERSION="12.0.1"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

39
packages/mediacenter/xbmc/patches/xbmc-001-add_support_to_specify_GIT_REV-0.1.patch
View File

@ -1,39 +0,0 @@
diff -Naur xbmc-9389dc8/configure.in xbmc-9389dc8.patch/configure.in
--- xbmc-9389dc8/configure.in 2011-09-01 17:21:47.000000000 +0200
+++ xbmc-9389dc8.patch/configure.in 2011-09-01 23:30:40.419399392 +0200
@@ -428,6 +428,14 @@
esac
AC_SUBST([ARCH])
+AC_CHECK_PROG(HAVE_GIT,git,"yes","no",)
+if test "$HAVE_GIT" = "yes" -a "$GIT_REV" = ""; then
+ GIT_REV=$(git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}')
+elif test "$GIT_REV" = ""; then
+ GIT_REV="Unknown"
+fi
+final_message="$final_message\n git Rev.:\t${GIT_REV}"
+
# platform debug flags
if test "$use_debug" = "yes"; then
final_message="$final_message\n Debugging:\tYes"
@@ -1177,7 +1185,6 @@
fi
fi
-AC_CHECK_PROG(HAVE_GIT,git,"yes","no",)
# Checks for header files.
AC_HEADER_DIRENT
@@ -1408,12 +1415,6 @@
final_message="$final_message\n Avahi:\tNo"
fi
-if test "$HAVE_GIT" = "yes"; then
- GIT_REV=$(git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}')
-fi
-if test "$GIT_REV" = ""; then
- GIT_REV="Unknown"
-fi
if test "$host_vendor" = "apple"; then
echo "#define GIT_REV \"$GIT_REV\"" > git_revision.h
else

276
packages/mediacenter/xbmc/patches/xbmc-464-fix-no-devices-found.patch
View File

@ -1,276 +0,0 @@
From ac29de2eff8fe144fdbe0330dc38036cf546a372 Mon Sep 17 00:00:00 2001
From: fritsch <peter.fruehberger@gmail.com>
Date: Thu, 31 Jan 2013 21:27:56 +0100
Subject: [PATCH 1/2] AE: make forced enumeration possible - this can be used
to delay startup when now devices are present
---
xbmc/cores/AudioEngine/AESinkFactory.cpp | 10 +++++-----
xbmc/cores/AudioEngine/AESinkFactory.h | 2 +-
xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp | 11 +++++++++++
xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 4 ++--
xbmc/cores/AudioEngine/Sinks/AESinkALSA.h | 2 +-
xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp | 2 +-
xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h | 2 +-
xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp | 2 +-
xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.h | 2 +-
xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp | 2 +-
xbmc/cores/AudioEngine/Sinks/AESinkOSS.h | 2 +-
xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp | 2 +-
xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.h | 4 ++--
13 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/xbmc/cores/AudioEngine/AESinkFactory.cpp b/xbmc/cores/AudioEngine/AESinkFactory.cpp
index b066ecd..9917f11 100644
--- a/xbmc/cores/AudioEngine/AESinkFactory.cpp
+++ b/xbmc/cores/AudioEngine/AESinkFactory.cpp
@@ -129,15 +129,15 @@ IAESink *CAESinkFactory::Create(std::string &device, AEAudioFormat &desiredForma
return NULL;
}
-#define ENUMERATE_SINK(SINK) { \
+#define ENUMERATE_SINK(SINK, force) { \
AESinkInfo info; \
info.m_sinkName = #SINK; \
- CAESink ##SINK::EnumerateDevicesEx(info.m_deviceInfoList); \
+ CAESink ##SINK::EnumerateDevicesEx(info.m_deviceInfoList, force); \
if(!info.m_deviceInfoList.empty()) \
list.push_back(info); \
}
-void CAESinkFactory::EnumerateEx(AESinkInfoList &list)
+void CAESinkFactory::EnumerateEx(AESinkInfoList &list, bool force)
{
#if defined(TARGET_WINDOWS)
ENUMERATE_SINK(DirectSound);
@@ -147,10 +147,10 @@ void CAESinkFactory::EnumerateEx(AESinkInfoList &list)
ENUMERATE_SINK(AUDIOTRACK);
#elif defined(TARGET_LINUX) || defined(TARGET_FREEBSD)
#if defined(HAS_ALSA)
- ENUMERATE_SINK(ALSA);
+ ENUMERATE_SINK(ALSA, force);
#endif
- ENUMERATE_SINK(OSS);
+ ENUMERATE_SINK(OSS, force);
#endif
}
diff --git a/xbmc/cores/AudioEngine/AESinkFactory.h b/xbmc/cores/AudioEngine/AESinkFactory.h
index 99c53f9..6f8a4e5 100644
--- a/xbmc/cores/AudioEngine/AESinkFactory.h
+++ b/xbmc/cores/AudioEngine/AESinkFactory.h
@@ -40,6 +40,6 @@ class CAESinkFactory
public:
static void ParseDevice(std::string &device, std::string &driver);
static IAESink *Create(std::string &device, AEAudioFormat &desiredFormat, bool rawPassthrough);
- static void EnumerateEx(AESinkInfoList &list);
+ static void EnumerateEx(AESinkInfoList &list, bool force = false);
};
diff --git a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
index 410e20c..8a19ac4 100644
--- a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
+++ b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
@@ -39,6 +39,7 @@
#include "Interfaces/AESink.h"
#include "Utils/AEUtil.h"
#include "Encoders/AEEncoderFFmpeg.h"
+#include <unistd.h>
using namespace std;
@@ -74,7 +75,17 @@
m_outputStageFn (NULL ),
m_streamStageFn (NULL )
{
+ unsigned int c_retry = 5;
CAESinkFactory::EnumerateEx(m_sinkInfoList);
+ while(m_sinkInfoList.size() == 0 && c_retry > 0)
+ {
+ CLog::Log(LOGNOTICE, "No Devices found - retry: %d", c_retry);
+ usleep(2000000);
+ c_retry--;
+ // retry the enumeration
+ CAESinkFactory::EnumerateEx(m_sinkInfoList, true);
+ }
+ CLog::Log(LOGNOTICE, "Found %lu Lists of Devices", m_sinkInfoList.size());
for (AESinkInfoList::iterator itt = m_sinkInfoList.begin(); itt != m_sinkInfoList.end(); ++itt)
{
CLog::Log(LOGNOTICE, "Enumerated %s devices:", itt->m_sinkName.c_str());
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
index 91218a4..b0d6bb1 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
@@ -676,11 +676,11 @@ bool CAESinkALSA::OpenPCMDevice(const std::string &name, const std::string &para
return false;
}
-void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list)
+void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list, bool force)
{
/* ensure that ALSA has been initialized */
snd_lib_error_set_handler(sndLibErrorHandler);
- if(!snd_config)
+ if(!snd_config || force)
snd_config_update();
snd_config_t *config;
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.h b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.h
index db1ba80..c1b1c76 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.h
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.h
@@ -50,7 +50,7 @@ class CAESinkALSA : public IAESink
virtual unsigned int AddPackets (uint8_t *data, unsigned int frames, bool hasAudio);
virtual void Drain ();
- static void EnumerateDevicesEx(AEDeviceInfoList &list);
+ static void EnumerateDevicesEx(AEDeviceInfoList &list, bool force = false);
private:
CAEChannelInfo GetChannelLayout(AEAudioFormat format);
void GetAESParams(const AEAudioFormat format, std::string& params);
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp
index e8a7876..8f23b41 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp
@@ -236,7 +236,7 @@ void CAESinkAUDIOTRACK::SetVolume(float volume)
m_volume_changed = true;
}
-void CAESinkAUDIOTRACK::EnumerateDevicesEx(AEDeviceInfoList &list)
+void CAESinkAUDIOTRACK::EnumerateDevicesEx(AEDeviceInfoList &list, bool force)
{
m_info.m_channels.Reset();
m_info.m_dataFormats.clear();
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h
index 46b3551..bbb7856 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h
@@ -43,7 +43,7 @@ class CAESinkAUDIOTRACK : public CThread, public IAESink
virtual void Drain ();
virtual bool HasVolume ();
virtual void SetVolume (float volume);
- static void EnumerateDevicesEx(AEDeviceInfoList &list);
+ static void EnumerateDevicesEx(AEDeviceInfoList &list, bool force = false);
private:
virtual void Process();
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp
index 4d3d41e..c9680e7 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp
@@ -464,7 +464,7 @@ double CAESinkDirectSound::GetCacheTotal()
return (double)m_dwBufferLen / (double)m_AvgBytesPerSec;
}
-void CAESinkDirectSound::EnumerateDevicesEx(AEDeviceInfoList &deviceInfoList)
+void CAESinkDirectSound::EnumerateDevicesEx(AEDeviceInfoList &deviceInfoList, bool force)
{
CAEDeviceInfo deviceInfo;
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.h b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.h
index 9f54090..2e6209b 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.h
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.h
@@ -43,7 +43,7 @@ class CAESinkDirectSound : public IAESink
virtual double GetCacheTime ();
virtual double GetCacheTotal ();
virtual unsigned int AddPackets (uint8_t *data, unsigned int frames, bool hasAudio);
- static void EnumerateDevicesEx (AEDeviceInfoList &deviceInfoList);
+ static void EnumerateDevicesEx (AEDeviceInfoList &deviceInfoList, bool force = false);
private:
void AEChannelsFromSpeakerMask(DWORD speakers);
DWORD SpeakerMaskFromAEChannels(const CAEChannelInfo &channels);
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp
index 06b9a7f..970e236 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp
@@ -427,7 +427,7 @@ void CAESinkOSS::Drain()
// ???
}
-void CAESinkOSS::EnumerateDevicesEx(AEDeviceInfoList &list)
+void CAESinkOSS::EnumerateDevicesEx(AEDeviceInfoList &list, bool force)
{
int mixerfd;
const char * mixerdev = "/dev/mixer";
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkOSS.h b/xbmc/cores/AudioEngine/Sinks/AESinkOSS.h
index aa8a9f8..7e2db8b 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkOSS.h
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkOSS.h
@@ -43,7 +43,7 @@ class CAESinkOSS : public IAESink
virtual double GetCacheTotal () { return 0.0; } /* FIXME */
virtual unsigned int AddPackets (uint8_t *data, unsigned int frames, bool hasAudio);
virtual void Drain ();
- static void EnumerateDevicesEx(AEDeviceInfoList &list);
+ static void EnumerateDevicesEx(AEDeviceInfoList &list, bool force = false);
private:
int m_fd;
std::string m_device;
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp
index 8475d60..f238d75 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp
@@ -559,7 +559,7 @@ bool CAESinkWASAPI::SoftResume()
return false;
}
-void CAESinkWASAPI::EnumerateDevicesEx(AEDeviceInfoList &deviceInfoList)
+void CAESinkWASAPI::EnumerateDevicesEx(AEDeviceInfoList &deviceInfoList, bool force)
{
IMMDeviceEnumerator* pEnumerator = NULL;
IMMDeviceCollection* pEnumDevices = NULL;
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.h b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.h
index a0c567a..7111ea9 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.h
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.h
@@ -45,7 +45,7 @@ class CAESinkWASAPI : public IAESink
virtual unsigned int AddPackets (uint8_t *data, unsigned int frames, bool hasAudio);
virtual bool SoftSuspend ();
virtual bool SoftResume ();
- static void EnumerateDevicesEx (AEDeviceInfoList &deviceInfoList);
+ static void EnumerateDevicesEx (AEDeviceInfoList &deviceInfoList, bool force = false);
private:
bool InitializeExclusive(AEAudioFormat &format);
void AEChannelsFromSpeakerMask(DWORD speakers);
@@ -78,4 +78,4 @@ class CAESinkWASAPI : public IAESink
unsigned int m_uiBufferLen; /* wasapi endpoint buffer size, in frames */
double m_avgTimeWaiting; /* time between next buffer of data from SoftAE and driver call for data */
double m_sinkLatency; /* time in seconds of total duration of the two WASAPI buffers */
-};
\ No newline at end of file
+};
--
1.7.10
From b236f0a78079f522f8f9743098820e6301e27625 Mon Sep 17 00:00:00 2001
From: fritsch <peter.fruehberger@gmail.com>
Date: Fri, 1 Feb 2013 13:05:24 +0100
Subject: [PATCH 2/2] AE: recreate alsa source tree to find new devices
---
xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
index b0d6bb1..61848a1 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
@@ -681,7 +681,13 @@ void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list, bool force)
/* ensure that ALSA has been initialized */
snd_lib_error_set_handler(sndLibErrorHandler);
if(!snd_config || force)
+ {
+ if(force)
+ snd_config_update_free_global();
+
snd_config_update();
+ }
+
snd_config_t *config;
snd_config_copy(&config, snd_config);
--
1.7.10

55
packages/mediacenter/xbmc/patches/xbmc-990.04-PR1934.patch Normal file
View File

@ -0,0 +1,55 @@
From 1704ff69ba704bf53505f7f9ac51ec06f93401ee Mon Sep 17 00:00:00 2001
From: wsnipex <wsnipex@a1.net>
Date: Sun, 9 Dec 2012 14:37:21 +0100
Subject: [PATCH 1/2] configure: allow GIT_REV to be read from VERSION file
needed for building outside of a git repo
---
configure.in | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/configure.in b/configure.in
index d8c7804..ac1445c 100644
--- a/configure.in
+++ b/configure.in
@@ -2160,7 +2160,12 @@ if test "$HAVE_GIT" = "yes"; then
GIT_REV=$(git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}')
fi
if test "$GIT_REV" = ""; then
- GIT_REV="Unknown"
+ if test -f VERSION ; then
+ GIT_REV=$(awk 'END{print substr($1,1,16)}' VERSION)
+ if test -z $GIT_REV ; then GIT_REV="Unknown" ; fi
+ else
+ GIT_REV="Unknown"
+ fi
fi
if test "$host_vendor" = "apple"; then
echo "#define GIT_REV \"$GIT_REV\"" > git_revision.h
--
1.7.10
From 4377a985c7e4e4d1f1c0abba68c2367d33ddab03 Mon Sep 17 00:00:00 2001
From: wsnipex <wsnipex@a1.net>
Date: Sun, 16 Dec 2012 17:46:12 +0100
Subject: [PATCH 2/2] release-source script needs bash on some systems /bin/sh
is a simplistic posix shell
---
tools/mk-release-source | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/mk-release-source b/tools/mk-release-source
index 7964665..68bdfa1 100755
--- a/tools/mk-release-source
+++ b/tools/mk-release-source
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
REVISION="${1}"
COMPRESS="gzip"
WORKDIR="xbmc-${REVISION}"
--
1.7.10

88
packages/mediacenter/xbmc/patches/xbmc-990.05-PR2193.patch Normal file
View File

@ -0,0 +1,88 @@
From 1e3abea7b9a4212005b11dbb5a9542ca9cbcd21a Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 7 Feb 2013 18:27:08 +0100
Subject: [PATCH] configure.in: change check for 'VERSION' file: - first check
if this file exist and use the content from there - if it
not exist check with 'git log' - if this fails set to
'Unknown'
This patch also shows the GIT_REV in the configure summary message. To display This message on top of the messages we move the whole block a bit above
---
configure.in | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/configure.in b/configure.in
index ac1445c..869fd29 100644
--- a/configure.in
+++ b/configure.in
@@ -687,6 +687,25 @@ case $use_platform in
;;
esac
+# check for GIT_REV
+AC_CHECK_PROG(HAVE_GIT,git,"yes","no",)
+if test "$GIT_REV" = ""; then
+ if test -f VERSION ; then
+ GIT_REV=$(awk 'END{print substr($1,1,16)}' VERSION)
+ elif test "$HAVE_GIT" = "yes"; then
+ GIT_REV=$(git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}')
+ else
+ GIT_REV="Unknown"
+ fi
+fi
+final_message="$final_message\n git Rev.:\t${GIT_REV}"
+
+if test "$host_vendor" = "apple"; then
+ echo "#define GIT_REV \"$GIT_REV\"" > git_revision.h
+else
+ SDL_DEFINES="$SDL_DEFINES -D'GIT_REV=\"$GIT_REV\"'"
+fi
+
if test "$build_shared_lib" = "yes"; then
final_message="$final_message\n Shared lib\tYes"
AC_SUBST(USE_LIBXBMC,1)
@@ -1886,8 +1905,6 @@ if test "$ARCH" = "i486-linux" || test "$ARCH" = "x86-freebsd"; then
fi
fi
-AC_CHECK_PROG(HAVE_GIT,git,"yes","no",)
-
# Checks for header files.
AC_HEADER_DIRENT
AC_HEADER_STDC
@@ -1943,7 +1960,7 @@ else
USE_OPENGL=1
else
final_message="$final_message\n OpenGL:\tNo (Very Slow)"
- SDL_DEFINES="-DHAS_SDL_2D"
+ SDL_DEFINES="$SDL_DEFINES -DHAS_SDL_2D"
USE_OPENGL=0
fi
fi
@@ -2156,23 +2173,6 @@ else
final_message="$final_message\n Avahi:\tNo"
fi
-if test "$HAVE_GIT" = "yes"; then
- GIT_REV=$(git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}')
-fi
-if test "$GIT_REV" = ""; then
- if test -f VERSION ; then
- GIT_REV=$(awk 'END{print substr($1,1,16)}' VERSION)
- if test -z $GIT_REV ; then GIT_REV="Unknown" ; fi
- else
- GIT_REV="Unknown"
- fi
-fi
-if test "$host_vendor" = "apple"; then
- echo "#define GIT_REV \"$GIT_REV\"" > git_revision.h
-else
- SDL_DEFINES="$SDL_DEFINES -D'GIT_REV=\"$GIT_REV\"'"
-fi
-
if test "$use_nonfree" = "yes"; then
final_message="$final_message\n Non-free:\tYes"
HAVE_XBMC_NONFREE=1
--
1.7.10

766
packages/mediacenter/xbmc/patches/xbmc-990.06-PR2152.patch Normal file
View File

@ -0,0 +1,766 @@
From 76c77d69ad5c08ee3dd0713201d263f50d6593ca Mon Sep 17 00:00:00 2001
From: fritsch <peter.fruehberger@gmail.com>
Date: Fri, 1 Feb 2013 15:33:19 +0100
Subject: [PATCH 1/5] AE: introduce force flag into interface
---
xbmc/cores/AudioEngine/AESinkFactory.cpp | 10 +++++-----
xbmc/cores/AudioEngine/AESinkFactory.h | 2 +-
xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 2 +-
xbmc/cores/AudioEngine/Sinks/AESinkALSA.h | 2 +-
xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp | 2 +-
xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h | 2 +-
xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp | 2 +-
xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.h | 2 +-
xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp | 2 +-
xbmc/cores/AudioEngine/Sinks/AESinkOSS.h | 2 +-
xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp | 2 +-
xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.h | 4 ++--
12 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/xbmc/cores/AudioEngine/AESinkFactory.cpp b/xbmc/cores/AudioEngine/AESinkFactory.cpp
index b066ecd..9917f11 100644
--- a/xbmc/cores/AudioEngine/AESinkFactory.cpp
+++ b/xbmc/cores/AudioEngine/AESinkFactory.cpp
@@ -129,15 +129,15 @@ IAESink *CAESinkFactory::Create(std::string &device, AEAudioFormat &desiredForma
return NULL;
}
-#define ENUMERATE_SINK(SINK) { \
+#define ENUMERATE_SINK(SINK, force) { \
AESinkInfo info; \
info.m_sinkName = #SINK; \
- CAESink ##SINK::EnumerateDevicesEx(info.m_deviceInfoList); \
+ CAESink ##SINK::EnumerateDevicesEx(info.m_deviceInfoList, force); \
if(!info.m_deviceInfoList.empty()) \
list.push_back(info); \
}
-void CAESinkFactory::EnumerateEx(AESinkInfoList &list)
+void CAESinkFactory::EnumerateEx(AESinkInfoList &list, bool force)
{
#if defined(TARGET_WINDOWS)
ENUMERATE_SINK(DirectSound);
@@ -147,10 +147,10 @@ void CAESinkFactory::EnumerateEx(AESinkInfoList &list)
ENUMERATE_SINK(AUDIOTRACK);
#elif defined(TARGET_LINUX) || defined(TARGET_FREEBSD)
#if defined(HAS_ALSA)
- ENUMERATE_SINK(ALSA);
+ ENUMERATE_SINK(ALSA, force);
#endif
- ENUMERATE_SINK(OSS);
+ ENUMERATE_SINK(OSS, force);
#endif
}
diff --git a/xbmc/cores/AudioEngine/AESinkFactory.h b/xbmc/cores/AudioEngine/AESinkFactory.h
index 99c53f9..185f562 100644
--- a/xbmc/cores/AudioEngine/AESinkFactory.h
+++ b/xbmc/cores/AudioEngine/AESinkFactory.h
@@ -40,6 +40,6 @@ class CAESinkFactory
public:
static void ParseDevice(std::string &device, std::string &driver);
static IAESink *Create(std::string &device, AEAudioFormat &desiredFormat, bool rawPassthrough);
- static void EnumerateEx(AESinkInfoList &list);
+ static void EnumerateEx(AESinkInfoList &list, bool force = false); /* The force flag can be used to indicate the rescan devices */
};
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
index 91218a4..df4098e 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
@@ -676,7 +676,7 @@ bool CAESinkALSA::OpenPCMDevice(const std::string &name, const std::string &para
return false;
}
-void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list)
+void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list, bool force)
{
/* ensure that ALSA has been initialized */
snd_lib_error_set_handler(sndLibErrorHandler);
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.h b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.h
index db1ba80..c1b1c76 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.h
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.h
@@ -50,7 +50,7 @@ class CAESinkALSA : public IAESink
virtual unsigned int AddPackets (uint8_t *data, unsigned int frames, bool hasAudio);
virtual void Drain ();
- static void EnumerateDevicesEx(AEDeviceInfoList &list);
+ static void EnumerateDevicesEx(AEDeviceInfoList &list, bool force = false);
private:
CAEChannelInfo GetChannelLayout(AEAudioFormat format);
void GetAESParams(const AEAudioFormat format, std::string& params);
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp
index e8a7876..8f23b41 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp
@@ -236,7 +236,7 @@ void CAESinkAUDIOTRACK::SetVolume(float scale)
m_volume_changed = true;
}
-void CAESinkAUDIOTRACK::EnumerateDevicesEx(AEDeviceInfoList &list)
+void CAESinkAUDIOTRACK::EnumerateDevicesEx(AEDeviceInfoList &list, bool force)
{
m_info.m_channels.Reset();
m_info.m_dataFormats.clear();
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h
index 46b3551..bbb7856 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h
@@ -43,7 +43,7 @@ class CAESinkAUDIOTRACK : public CThread, public IAESink
virtual void Drain ();
virtual bool HasVolume ();
virtual void SetVolume (float volume);
- static void EnumerateDevicesEx(AEDeviceInfoList &list);
+ static void EnumerateDevicesEx(AEDeviceInfoList &list, bool force = false);
private:
virtual void Process();
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp
index 4d3d41e..c9680e7 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp
@@ -464,7 +464,7 @@ double CAESinkDirectSound::GetCacheTotal()
return (double)m_dwBufferLen / (double)m_AvgBytesPerSec;
}
-void CAESinkDirectSound::EnumerateDevicesEx(AEDeviceInfoList &deviceInfoList)
+void CAESinkDirectSound::EnumerateDevicesEx(AEDeviceInfoList &deviceInfoList, bool force)
{
CAEDeviceInfo deviceInfo;
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.h b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.h
index 9f54090..2e6209b 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.h
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.h
@@ -43,7 +43,7 @@ class CAESinkDirectSound : public IAESink
virtual double GetCacheTime ();
virtual double GetCacheTotal ();
virtual unsigned int AddPackets (uint8_t *data, unsigned int frames, bool hasAudio);
- static void EnumerateDevicesEx (AEDeviceInfoList &deviceInfoList);
+ static void EnumerateDevicesEx (AEDeviceInfoList &deviceInfoList, bool force = false);
private:
void AEChannelsFromSpeakerMask(DWORD speakers);
DWORD SpeakerMaskFromAEChannels(const CAEChannelInfo &channels);
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp
index 06b9a7f..970e236 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp
@@ -427,7 +427,7 @@ void CAESinkOSS::Drain()
// ???
}
-void CAESinkOSS::EnumerateDevicesEx(AEDeviceInfoList &list)
+void CAESinkOSS::EnumerateDevicesEx(AEDeviceInfoList &list, bool force)
{
int mixerfd;
const char * mixerdev = "/dev/mixer";
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkOSS.h b/xbmc/cores/AudioEngine/Sinks/AESinkOSS.h
index aa8a9f8..7e2db8b 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkOSS.h
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkOSS.h
@@ -43,7 +43,7 @@ class CAESinkOSS : public IAESink
virtual double GetCacheTotal () { return 0.0; } /* FIXME */
virtual unsigned int AddPackets (uint8_t *data, unsigned int frames, bool hasAudio);
virtual void Drain ();
- static void EnumerateDevicesEx(AEDeviceInfoList &list);
+ static void EnumerateDevicesEx(AEDeviceInfoList &list, bool force = false);
private:
int m_fd;
std::string m_device;
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp
index 8475d60..f238d75 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp
@@ -559,7 +559,7 @@ bool CAESinkWASAPI::SoftResume()
return false;
}
-void CAESinkWASAPI::EnumerateDevicesEx(AEDeviceInfoList &deviceInfoList)
+void CAESinkWASAPI::EnumerateDevicesEx(AEDeviceInfoList &deviceInfoList, bool force)
{
IMMDeviceEnumerator* pEnumerator = NULL;
IMMDeviceCollection* pEnumDevices = NULL;
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.h b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.h
index a0c567a..7111ea9 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.h
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.h
@@ -45,7 +45,7 @@ class CAESinkWASAPI : public IAESink
virtual unsigned int AddPackets (uint8_t *data, unsigned int frames, bool hasAudio);
virtual bool SoftSuspend ();
virtual bool SoftResume ();
- static void EnumerateDevicesEx (AEDeviceInfoList &deviceInfoList);
+ static void EnumerateDevicesEx (AEDeviceInfoList &deviceInfoList, bool force = false);
private:
bool InitializeExclusive(AEAudioFormat &format);
void AEChannelsFromSpeakerMask(DWORD speakers);
@@ -78,4 +78,4 @@ class CAESinkWASAPI : public IAESink
unsigned int m_uiBufferLen; /* wasapi endpoint buffer size, in frames */
double m_avgTimeWaiting; /* time between next buffer of data from SoftAE and driver call for data */
double m_sinkLatency; /* time in seconds of total duration of the two WASAPI buffers */
-};
\ No newline at end of file
+};
--
1.7.10
From 6064764b619a51d5d234d9c83023af6820277dce Mon Sep 17 00:00:00 2001
From: fritsch <peter.fruehberger@gmail.com>
Date: Fri, 1 Feb 2013 15:25:35 +0100
Subject: [PATCH 2/5] AE: (Alsa) Wait for at least one audio output device
when starting up for max 10 seconds
---
xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp | 10 ++++++++++
xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 7 ++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
index 410e20c..30da558 100644
--- a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
+++ b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
@@ -74,7 +74,17 @@
m_outputStageFn (NULL ),
m_streamStageFn (NULL )
{
+ unsigned int c_retry = 5;
CAESinkFactory::EnumerateEx(m_sinkInfoList);
+ while(m_sinkInfoList.size() == 0 && c_retry > 0)
+ {
+ CLog::Log(LOGNOTICE, "No Devices found - retry: %d", c_retry);
+ Sleep(2000);
+ c_retry--;
+ // retry the enumeration
+ CAESinkFactory::EnumerateEx(m_sinkInfoList, true);
+ }
+ CLog::Log(LOGNOTICE, "Found %lu Lists of Devices", m_sinkInfoList.size());
for (AESinkInfoList::iterator itt = m_sinkInfoList.begin(); itt != m_sinkInfoList.end(); ++itt)
{
CLog::Log(LOGNOTICE, "Enumerated %s devices:", itt->m_sinkName.c_str());
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
index df4098e..bc91096 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
@@ -680,8 +680,13 @@ void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list, bool force)
{
/* ensure that ALSA has been initialized */
snd_lib_error_set_handler(sndLibErrorHandler);
- if(!snd_config)
+ if(!snd_config || force)
+ {
+ if(force)
+ snd_config_update_free_global();
+
snd_config_update();
+ }
snd_config_t *config;
snd_config_copy(&config, snd_config);
--
1.7.10
From 066769f4dd4128232bbcbeb645376ffa8886d263 Mon Sep 17 00:00:00 2001
From: fritsch <peter.fruehberger@gmail.com>
Date: Sat, 2 Feb 2013 11:46:22 +0100
Subject: [PATCH 3/5] AE: Fix suspend / resume with alsa - (Warning: Race
condition AddPackets still to fix)
---
xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp | 138 +++++++++++++++++-----
xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.h | 5 +
xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 1 -
3 files changed, 111 insertions(+), 33 deletions(-)
diff --git a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
index 30da558..36c4d57 100644
--- a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
+++ b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
@@ -59,6 +59,8 @@
m_audiophile (true ),
m_running (false ),
m_reOpen (false ),
+ m_closeSink (false ),
+ m_realSuspend (false ),
m_isSuspended (false ),
m_softSuspend (false ),
m_softSuspendTimer (0 ),
@@ -85,20 +87,7 @@
CAESinkFactory::EnumerateEx(m_sinkInfoList, true);
}
CLog::Log(LOGNOTICE, "Found %lu Lists of Devices", m_sinkInfoList.size());
- for (AESinkInfoList::iterator itt = m_sinkInfoList.begin(); itt != m_sinkInfoList.end(); ++itt)
- {
- CLog::Log(LOGNOTICE, "Enumerated %s devices:", itt->m_sinkName.c_str());
- int count = 0;
- for (AEDeviceInfoList::iterator itt2 = itt->m_deviceInfoList.begin(); itt2 != itt->m_deviceInfoList.end(); ++itt2)
- {
- CLog::Log(LOGNOTICE, " Device %d", ++count);
- CAEDeviceInfo& info = *itt2;
- std::stringstream ss((std::string)info);
- std::string line;
- while(std::getline(ss, line, '\n'))
- CLog::Log(LOGNOTICE, " %s", line.c_str());
- }
- }
+ PrintSinks();
}
CSoftAE::~CSoftAE()
@@ -189,6 +178,20 @@ void CSoftAE::OpenSink()
m_wake.Set();
}
+void CSoftAE::InternalCloseSink()
+{
+ /* close the old sink if it was open */
+ if (m_sink)
+ {
+ CExclusiveLock sinkLock(m_sinkLock);
+ m_sink->Drain();
+ m_sink->Deinitialize();
+ delete m_sink;
+ m_sink = NULL;
+ }
+ m_closeSink = false;
+ m_closeEvent.Set();
+}
/* this must NEVER be called from outside the main thread or Initialization */
void CSoftAE::InternalOpenSink()
{
@@ -315,15 +318,8 @@ void CSoftAE::InternalOpenSink()
CExclusiveLock sinkLock(m_sinkLock);
reInit = true;
-
- /* we are going to open, so close the old sink if it was open */
- if (m_sink)
- {
- m_sink->Drain();
- m_sink->Deinitialize();
- delete m_sink;
- m_sink = NULL;
- }
+ //close the sink cause it gets reinited
+ InternalCloseSink();
/* get the display name of the device */
GetDeviceFriendlyName(device);
@@ -877,10 +873,19 @@ IAEStream *CSoftAE::FreeStream(IAEStream *stream)
RemoveStream(m_playingStreams, (CSoftAEStream*)stream);
RemoveStream(m_streams , (CSoftAEStream*)stream);
lock.Leave();
-
- /* if it was the master stream we need to reopen before deletion */
- if (m_masterStream == stream)
- OpenSink();
+ // Close completely when we go to suspend, reopen as it was old behaviour
+ // m_realSuspend is currently only used on Linux Systems as it is needed
+ // for suspend and resume. Not opening when masterstream stops means
+ // clipping on S/PDIF.
+ if(m_realSuspend)
+ {
+ m_closeEvent.Reset();
+ m_closeSink = true;
+ m_closeEvent.Wait();
+ m_wake.Set();
+ }
+ else if (m_masterStream == stream)
+ OpenSink();
delete (CSoftAEStream*)stream;
return NULL;
@@ -986,14 +991,52 @@ bool CSoftAE::Suspend()
CSoftAEStream *stream = *itt;
stream->Flush();
}
+ #if defined(TARGET_LINUX)
+ /*workaround sinks not playing sound after resume */
+ StopAllSounds();
+ CExclusiveLock sinkLock(m_sinkLock);
+ for (AESinkInfoList::iterator itt = m_sinkInfoList.begin(); itt != m_sinkInfoList.end(); ++itt)
+ {
+ itt->m_deviceInfoList.pop_back();
+ }
+ if(m_sink)
+ {
+ /* Deinitialize and delete current m_sink */
+ // we don't want that Run reopens our device.
+ // This is the only place m_realSuspend gets set true.
+ // If you find another one - please call for help.
+ // First thing when rewriting: kill this flag and make it generic again.
+ m_realSuspend = true;
+ m_sink->Drain();
+ m_sink->Deinitialize();
+ delete m_sink;
+ m_sink = NULL;
+ }
+ // The device list is now empty and must be reenumerated afterwards.
+ m_sinkInfoList.clear();
+ #endif
return true;
}
bool CSoftAE::Resume()
{
+#if defined(TARGET_LINUX)
+ // We must make sure, that we don't return empty.
+ if(m_realSuspend || m_sinkInfoList.empty())
+ {
+ CLog::Log(LOGDEBUG, "CSoftAE::Resume - Re Enumerating Sinks");
+ CExclusiveLock sinkLock(m_sinkLock);
+ // Forced enumeration - we are sure that we start completely fresh.
+ CAESinkFactory::EnumerateEx(m_sinkInfoList, true);
+ m_realSuspend = false;
+ sinkLock.Leave(); // we leave here explicitly to not lock while printing new sinks
+ PrintSinks();
+ }
+#endif
CLog::Log(LOGDEBUG, "CSoftAE::Resume - Resuming AE processing");
m_isSuspended = false;
+ // we flag reopen
m_reOpen = true;
return true;
@@ -1030,6 +1073,12 @@ void CSoftAE::Run()
restart = true;
}
+ //we are told to close the sink
+ if(m_closeSink)
+ {
+ InternalCloseSink();
+ }
+
/* Handle idle or forced suspend */
ProcessSuspend();
@@ -1040,6 +1089,7 @@ void CSoftAE::Run()
InternalOpenSink();
m_isSuspended = false; // exit Suspend state
}
+
#if defined(TARGET_ANDROID)
else if (m_playingStreams.empty()
&& m_playing_sounds.empty()
@@ -1290,6 +1340,24 @@ int CSoftAE::RunTranscodeStage(bool hasAudio)
return encodedFrames;
}
+void CSoftAE::PrintSinks()
+{
+ for (AESinkInfoList::iterator itt = m_sinkInfoList.begin(); itt != m_sinkInfoList.end(); ++itt)
+ {
+ CLog::Log(LOGNOTICE, "Enumerated %s devices:", itt->m_sinkName.c_str());
+ int count = 0;
+ for (AEDeviceInfoList::iterator itt2 = itt->m_deviceInfoList.begin(); itt2 != itt->m_deviceInfoList.end(); ++itt2)
+ {
+ CLog::Log(LOGNOTICE, " Device %d", ++count);
+ CAEDeviceInfo& info = *itt2;
+ std::stringstream ss((std::string)info);
+ std::string line;
+ while(std::getline(ss, line, '\n'))
+ CLog::Log(LOGNOTICE, " %s", line.c_str());
+ }
+ }
+}
+
unsigned int CSoftAE::RunRawStreamStage(unsigned int channelCount, void *out, bool &restart)
{
StreamList resumeStreams;
@@ -1424,14 +1492,14 @@ inline void CSoftAE::ProcessSuspend()
/* idle while in Suspend() state until Resume() called */
/* idle if nothing to play and user hasn't enabled */
/* continuous streaming (silent stream) in as.xml */
- while ((m_isSuspended || (m_softSuspend && (curSystemClock > m_softSuspendTimer))) &&
- m_running && !m_reOpen)
+ while (m_realSuspend || ((m_isSuspended || (m_softSuspend && (curSystemClock > m_softSuspendTimer))) &&
+ m_running && !m_reOpen))
{
- if (m_sink && !sinkIsSuspended)
+ if (!m_realSuspend && m_sink && !sinkIsSuspended)
{
/* put the sink in Suspend mode */
CExclusiveLock sinkLock(m_sinkLock);
- if (!m_sink->SoftSuspend())
+ if (m_sink && !m_sink->SoftSuspend())
{
sinkIsSuspended = false; //sink cannot be suspended
m_softSuspend = false; //break suspend loop
@@ -1442,11 +1510,17 @@ inline void CSoftAE::ProcessSuspend()
sinkLock.Leave();
}
+ // make sure that a outer thread does not have to wait forever
+ if(m_closeSink)
+ {
+ InternalCloseSink();
+ }
+
/* idle for platform-defined time */
m_wake.WaitMSec(SOFTAE_IDLE_WAIT_MSEC);
/* check if we need to resume for stream or sound */
- if (!m_isSuspended && (!m_playingStreams.empty() || !m_playing_sounds.empty()))
+ if (!m_realSuspend && !m_isSuspended && (!m_playingStreams.empty() || !m_playing_sounds.empty()))
{
m_reOpen = !m_sink->SoftResume(); // sink returns false if it requires reinit
sinkIsSuspended = false; //sink processing data
diff --git a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.h b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.h
index 56fb417..f3787c9 100644
--- a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.h
+++ b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.h
@@ -116,6 +116,7 @@ class CSoftAE : public IThreadedAE
void OpenSink();
void InternalOpenSink();
+ void InternalCloseSink();
void ResetEncoder();
bool SetupEncoder(AEAudioFormat &format);
void Deinitialize();
@@ -136,11 +137,14 @@ class CSoftAE : public IThreadedAE
/* internal vars */
bool m_running, m_reOpen;
+ bool m_closeSink;
+ bool m_realSuspend; /* this flag is needed to unload a sink without calling OpenInternal again */
bool m_isSuspended; /* engine suspended by external function to release audio context */
bool m_softSuspend; /* latches after last stream or sound played for timer below for idle */
unsigned int m_softSuspendTimer; /* time in milliseconds to hold sink open before soft suspend for idle */
CEvent m_reOpenEvent;
CEvent m_wake;
+ CEvent m_closeEvent;
CCriticalSection m_runningLock; /* released when the thread exits */
CCriticalSection m_streamLock; /* m_streams lock */
@@ -242,5 +246,6 @@ class CSoftAE : public IThreadedAE
void RunNormalizeStage (unsigned int channelCount, void *out, unsigned int mixed);
void RemoveStream(StreamList &streams, CSoftAEStream *stream);
+ void PrintSinks();
};
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
index bc91096..328593c 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
@@ -426,7 +426,6 @@ void CAESinkALSA::Deinitialize()
if (m_pcm)
{
- snd_pcm_drop (m_pcm);
snd_pcm_close(m_pcm);
m_pcm = NULL;
}
--
1.7.10
From bf5dd9592078037faf5a12e1437c8ef3e8eea1d7 Mon Sep 17 00:00:00 2001
From: fritsch <peter.fruehberger@gmail.com>
Date: Tue, 5 Feb 2013 21:17:10 +0100
Subject: [PATCH 4/5] AE: Enable SoftSuspend on Linux (Stop h0gg1ng the sound
device)
---
xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp | 8 +++++---
xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 21 +++++++++++++++++++++
xbmc/cores/AudioEngine/Sinks/AESinkALSA.h | 2 ++
3 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
index 36c4d57..ae8a0e4 100644
--- a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
+++ b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
@@ -1475,8 +1475,7 @@ inline void CSoftAE::ProcessSuspend()
{
bool sinkIsSuspended = false;
unsigned int curSystemClock = 0;
-
-#if defined(TARGET_WINDOWS)
+#if defined(TARGET_WINDOWS) || defined(TARGET_LINUX)
if (!m_softSuspend && m_playingStreams.empty() && m_playing_sounds.empty() &&
!g_advancedSettings.m_streamSilence)
{
@@ -1488,7 +1487,6 @@ inline void CSoftAE::ProcessSuspend()
if (m_softSuspend)
curSystemClock = XbmcThreads::SystemClockMillis();
#endif
-
/* idle while in Suspend() state until Resume() called */
/* idle if nothing to play and user hasn't enabled */
/* continuous streaming (silent stream) in as.xml */
@@ -1506,7 +1504,10 @@ inline void CSoftAE::ProcessSuspend()
break;
}
else
+ {
+ CLog::Log(LOGDEBUG, "Suspended the Sink");
sinkIsSuspended = true; //sink has suspended processing
+ }
sinkLock.Leave();
}
@@ -1525,6 +1526,7 @@ inline void CSoftAE::ProcessSuspend()
m_reOpen = !m_sink->SoftResume(); // sink returns false if it requires reinit
sinkIsSuspended = false; //sink processing data
m_softSuspend = false; //break suspend loop
+ CLog::Log(LOGDEBUG, "Resumed the Sink");
break;
}
}
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
index 328593c..647be04 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
@@ -1129,6 +1129,27 @@ bool CAESinkALSA::GetELD(snd_hctl_t *hctl, int device, CAEDeviceInfo& info, bool
return true;
}
+bool CAESinkALSA::SoftSuspend()
+{
+ if(m_pcm) // it is still there
+ Deinitialize();
+
+ return true;
+}
+bool CAESinkALSA::SoftResume()
+{
+ // reinit all the clibber
+ if(!m_pcm)
+ {
+ if (!snd_config)
+ snd_config_update();
+
+ Initialize(m_initFormat, m_initDevice);
+ }
+ //we want that AE loves us again
+ return false; // force reinit
+}
+
void CAESinkALSA::sndLibErrorHandler(const char *file, int line, const char *function, int err, const char *fmt, ...)
{
va_list arg;
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.h b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.h
index c1b1c76..c60f840 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.h
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.h
@@ -49,6 +49,8 @@ class CAESinkALSA : public IAESink
virtual double GetCacheTotal ();
virtual unsigned int AddPackets (uint8_t *data, unsigned int frames, bool hasAudio);
virtual void Drain ();
+ virtual bool SoftSuspend();
+ virtual bool SoftResume();
static void EnumerateDevicesEx(AEDeviceInfoList &list, bool force = false);
private:
--
1.7.10
From 03be1460010107832a63d53f8d3fd539255ec1ac Mon Sep 17 00:00:00 2001
From: fritsch <peter.fruehberger@gmail.com>
Date: Wed, 6 Feb 2013 09:03:34 +0100
Subject: [PATCH 5/5] AE: Wait until we are in a safe state before further
deinitializing the sink (care for deadlocks)
---
xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp | 39 +++++++++++++++++-----
xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.h | 1 +
2 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
index ae8a0e4..343758c 100644
--- a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
+++ b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
@@ -1006,11 +1006,18 @@ bool CSoftAE::Suspend()
// This is the only place m_realSuspend gets set true.
// If you find another one - please call for help.
// First thing when rewriting: kill this flag and make it generic again.
+ m_saveSuspend.Reset();
m_realSuspend = true;
+ // wait until we are looping in ProcessSuspend()
+ m_saveSuspend.Wait();
m_sink->Drain();
m_sink->Deinitialize();
delete m_sink;
m_sink = NULL;
+ // signal anybody, that the sink is closed now
+ // this should help us not to run into deadlocks
+ if(m_closeSink)
+ m_closeEvent.Set();
}
// The device list is now empty and must be reenumerated afterwards.
m_sinkInfoList.clear();
@@ -1086,6 +1093,13 @@ void CSoftAE::Run()
if (m_reOpen || restart || !m_sink)
{
CLog::Log(LOGDEBUG, "CSoftAE::Run - Sink restart flagged");
+ // ProcessSuspending() cannot guarantee that we get our sink back softresumed
+ if(m_sink && m_softSuspend)
+ {
+ m_sink->SoftResume();
+ m_softSuspend = false;
+ CLog::Log(LOGDEBUG, "CSoftAE::Run - Soft resumed the sink outside");
+ }
InternalOpenSink();
m_isSuspended = false; // exit Suspend state
}
@@ -1510,22 +1524,29 @@ inline void CSoftAE::ProcessSuspend()
}
sinkLock.Leave();
}
-
- // make sure that a outer thread does not have to wait forever
- if(m_closeSink)
- {
- InternalCloseSink();
- }
+ // Signal that the realSuspend can go on now.
+ // Idea: Outer thread calls Suspend() - but
+ // because of AddPackets does not care about locks, we must make
+ // sure, that our school bus (AE::Run) is currently driving through
+ // some gas station, before we move away the sink.
+ if(m_realSuspend)
+ m_saveSuspend.Set();
/* idle for platform-defined time */
m_wake.WaitMSec(SOFTAE_IDLE_WAIT_MSEC);
- /* check if we need to resume for stream or sound */
+ /* check if we need to resume for stream or sound or somebody wants to open us
+ * the suspend checks are only there to:
+ * a) not run out of softSuspend directly when we are sleeping
+ * b) nail(!) the thread during real Suspend into this method
+ * Note: It is not enough to check the streams buffer, cause it might not be filled yet
+ * We have to check after ProcessSuspending() if the sink is still in softsleep and resume it
+ */
if (!m_realSuspend && !m_isSuspended && (!m_playingStreams.empty() || !m_playing_sounds.empty()))
{
- m_reOpen = !m_sink->SoftResume(); // sink returns false if it requires reinit
+ m_reOpen = m_reOpen || !m_sink->SoftResume(); // sink returns false if it requires reinit
sinkIsSuspended = false; //sink processing data
- m_softSuspend = false; //break suspend loop
+ m_softSuspend = false; //break suspend loop (under some conditions)
CLog::Log(LOGDEBUG, "Resumed the Sink");
break;
}
diff --git a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.h b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.h
index f3787c9..9d6399e 100644
--- a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.h
+++ b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.h
@@ -145,6 +145,7 @@ class CSoftAE : public IThreadedAE
CEvent m_reOpenEvent;
CEvent m_wake;
CEvent m_closeEvent;
+ CEvent m_saveSuspend;
CCriticalSection m_runningLock; /* released when the thread exits */
CCriticalSection m_streamLock; /* m_streams lock */
--
1.7.10

2
packages/sysutils/busybox/config/busybox.conf
View File

@ -891,7 +891,7 @@ CONFIG_IOSTAT=y
CONFIG_MPSTAT=y CONFIG_MPSTAT=y
# CONFIG_NMETER is not set # CONFIG_NMETER is not set
CONFIG_PMAP=y CONFIG_PMAP=y
CONFIG_POWERTOP=y # CONFIG_POWERTOP is not set
CONFIG_PSTREE=y CONFIG_PSTREE=y
CONFIG_PWDX=y CONFIG_PWDX=y
CONFIG_SMEMCAP=y CONFIG_SMEMCAP=y

12
packages/sysutils/remote/lirc/config/lircd.conf.xbox
View File

@ -21,14 +21,15 @@ begin remote
one 0 0 one 0 0
zero 0 0 zero 0 0
gap 63985 gap 63950
min_repeat 13 min_repeat 4
# suppress_repeat 13 # suppress_repeat 4
# uncomment to suppress unwanted repeats # uncomment to suppress unwanted repeats
# toggle_bit_mask 0x72 # toggle_bit_mask 0x72
toggle_bit_mask 0xE1 toggle_bit_mask 0xE1
begin codes begin codes
KEY_OK 0x0B
KEY_OK 0xEA KEY_OK 0xEA
KEY_STOP 0xE0 KEY_STOP 0xE0
KEY_PAUSE 0xE6 KEY_PAUSE 0xE6
@ -37,15 +38,14 @@ begin remote
KEY_FASTFORWARD 0xE3 KEY_FASTFORWARD 0xE3
KEY_REWIND 0xE2 KEY_REWIND 0xE2
KEY_PROG1 0xD5 KEY_PROG1 0xD5
KEY_TITLE 0xE5 KEY_EPG 0xE5
KEY_INFO 0xC3 KEY_INFO 0xC3
KEY_OK 0x0B
KEY_UP 0xA6 KEY_UP 0xA6
KEY_DOWN 0xA7 KEY_DOWN 0xA7
KEY_LEFT 0xA9 KEY_LEFT 0xA9
KEY_RIGHT 0xA8 KEY_RIGHT 0xA8
KEY_MENU 0xF7 KEY_MENU 0xF7
KEY_BACK 0xD8 KEY_EXIT 0xD8
KEY_0 0xCF KEY_0 0xCF
KEY_1 0xCE KEY_1 0xCE
KEY_2 0xCD KEY_2 0xCD

59
projects/ARCTIC_MC/linux/linux.x86_64.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86_64 3.7.5 Kernel Configuration # Linux/x86_64 3.7.6 Kernel Configuration
# #
CONFIG_64BIT=y CONFIG_64BIT=y
CONFIG_X86_64=y CONFIG_X86_64=y
@ -883,6 +883,7 @@ CONFIG_EEPROM_93CX6=m
# Altera FPGA firmware download module # Altera FPGA firmware download module
# #
CONFIG_ALTERA_STAPL=m CONFIG_ALTERA_STAPL=m
# CONFIG_INTEL_MEI is not set
CONFIG_HAVE_IDE=y CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set # CONFIG_IDE is not set
@ -1641,6 +1642,8 @@ CONFIG_SENSORS_CORETEMP=m
# CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47M192 is not set
# CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_SMSC47B397 is not set
# CONFIG_SENSORS_SCH56XX_COMMON is not set # CONFIG_SENSORS_SCH56XX_COMMON is not set
# CONFIG_SENSORS_SCH5627 is not set
# CONFIG_SENSORS_SCH5636 is not set
# CONFIG_SENSORS_ADS1015 is not set # CONFIG_SENSORS_ADS1015 is not set
# CONFIG_SENSORS_ADS7828 is not set # CONFIG_SENSORS_ADS7828 is not set
# CONFIG_SENSORS_AMC6821 is not set # CONFIG_SENSORS_AMC6821 is not set
@ -1672,7 +1675,59 @@ CONFIG_SENSORS_W83627EHF=y
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_HWMON=y
CONFIG_CPU_THERMAL=y CONFIG_CPU_THERMAL=y
# CONFIG_WATCHDOG is not set CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
CONFIG_WATCHDOG_NOWAYOUT=y
#
# Watchdog Device Drivers
#
CONFIG_SOFT_WATCHDOG=y
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_ADVANTECH_WDT is not set
# CONFIG_ALIM1535_WDT is not set
# CONFIG_ALIM7101_WDT is not set
# CONFIG_F71808E_WDT is not set
# CONFIG_SP5100_TCO is not set
# CONFIG_SC520_WDT is not set
# CONFIG_SBC_FITPC2_WATCHDOG is not set
# CONFIG_EUROTECH_WDT is not set
# CONFIG_IB700_WDT is not set
# CONFIG_IBMASR is not set
# CONFIG_WAFER_WDT is not set
# CONFIG_I6300ESB_WDT is not set
# CONFIG_IE6XX_WDT is not set
# CONFIG_ITCO_WDT is not set
# CONFIG_IT8712F_WDT is not set
# CONFIG_IT87_WDT is not set
# CONFIG_HP_WATCHDOG is not set
# CONFIG_SC1200_WDT is not set
# CONFIG_PC87413_WDT is not set
# CONFIG_NV_TCO is not set
# CONFIG_60XX_WDT is not set
# CONFIG_SBC8360_WDT is not set
# CONFIG_CPU5_WDT is not set
# CONFIG_SMSC_SCH311X_WDT is not set
# CONFIG_SMSC37B787_WDT is not set
# CONFIG_VIA_WDT is not set
# CONFIG_W83627HF_WDT is not set
# CONFIG_W83697HF_WDT is not set
# CONFIG_W83697UG_WDT is not set
# CONFIG_W83877F_WDT is not set
# CONFIG_W83977F_WDT is not set
# CONFIG_MACHZ_WDT is not set
# CONFIG_SBC_EPX_C3_WATCHDOG is not set
#
# PCI-based Watchdog Cards
#
# CONFIG_PCIPCWATCHDOG is not set
# CONFIG_WDTPCI is not set
#
# USB-based Watchdog Cards
#
# CONFIG_USBPCWATCHDOG is not set
CONFIG_SSB_POSSIBLE=y CONFIG_SSB_POSSIBLE=y
# #

71
projects/ATV/linux/linux.i386.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/i386 3.7.3 Kernel Configuration # Linux/i386 3.7.6 Kernel Configuration
# #
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_X86_32=y CONFIG_X86_32=y
@ -508,7 +508,6 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
# CONFIG_X86_ACPI_CPUFREQ is not set # CONFIG_X86_ACPI_CPUFREQ is not set
# CONFIG_X86_POWERNOW_K6 is not set # CONFIG_X86_POWERNOW_K6 is not set
# CONFIG_X86_POWERNOW_K7 is not set # CONFIG_X86_POWERNOW_K7 is not set
# CONFIG_X86_POWERNOW_K8 is not set
# CONFIG_X86_GX_SUSPMOD is not set # CONFIG_X86_GX_SUSPMOD is not set
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_SPEEDSTEP_ICH=y CONFIG_X86_SPEEDSTEP_ICH=y
@ -927,6 +926,7 @@ CONFIG_EEPROM_93CX6=m
# Altera FPGA firmware download module # Altera FPGA firmware download module
# #
CONFIG_ALTERA_STAPL=m CONFIG_ALTERA_STAPL=m
# CONFIG_INTEL_MEI is not set
CONFIG_HAVE_IDE=y CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set # CONFIG_IDE is not set
@ -1310,15 +1310,6 @@ CONFIG_CARL9170_LEDS=y
CONFIG_CARL9170_WPC=y CONFIG_CARL9170_WPC=y
# CONFIG_ATH6KL is not set # CONFIG_ATH6KL is not set
# CONFIG_B43 is not set # CONFIG_B43 is not set
# CONFIG_B43_SSB is not set
# CONFIG_B43_PCI_AUTOSELECT is not set
# CONFIG_B43_PCICORE_AUTOSELECT is not set
# CONFIG_B43_PIO is not set
# CONFIG_B43_PHY_N is not set
# CONFIG_B43_PHY_LP is not set
# CONFIG_B43_PHY_HT is not set
# CONFIG_B43_LEDS is not set
# CONFIG_B43_DEBUG is not set
# CONFIG_B43LEGACY is not set # CONFIG_B43LEGACY is not set
# CONFIG_BRCMFMAC is not set # CONFIG_BRCMFMAC is not set
# CONFIG_HOSTAP is not set # CONFIG_HOSTAP is not set
@ -1629,7 +1620,60 @@ CONFIG_POWER_SUPPLY=y
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_CPU_THERMAL=y CONFIG_CPU_THERMAL=y
# CONFIG_WATCHDOG is not set CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
CONFIG_WATCHDOG_NOWAYOUT=y
#
# Watchdog Device Drivers
#
CONFIG_SOFT_WATCHDOG=y
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_ADVANTECH_WDT is not set
# CONFIG_ALIM1535_WDT is not set
# CONFIG_ALIM7101_WDT is not set
# CONFIG_F71808E_WDT is not set
# CONFIG_SP5100_TCO is not set
# CONFIG_SC520_WDT is not set
# CONFIG_SBC_FITPC2_WATCHDOG is not set
# CONFIG_EUROTECH_WDT is not set
# CONFIG_IB700_WDT is not set
# CONFIG_IBMASR is not set
# CONFIG_WAFER_WDT is not set
# CONFIG_I6300ESB_WDT is not set
# CONFIG_IE6XX_WDT is not set
# CONFIG_ITCO_WDT is not set
# CONFIG_IT8712F_WDT is not set
# CONFIG_IT87_WDT is not set
# CONFIG_HP_WATCHDOG is not set
# CONFIG_SC1200_WDT is not set
# CONFIG_PC87413_WDT is not set
# CONFIG_NV_TCO is not set
# CONFIG_60XX_WDT is not set
# CONFIG_SBC8360_WDT is not set
# CONFIG_SBC7240_WDT is not set
# CONFIG_CPU5_WDT is not set
# CONFIG_SMSC_SCH311X_WDT is not set
# CONFIG_SMSC37B787_WDT is not set
# CONFIG_VIA_WDT is not set
# CONFIG_W83627HF_WDT is not set
# CONFIG_W83697HF_WDT is not set
# CONFIG_W83697UG_WDT is not set
# CONFIG_W83877F_WDT is not set
# CONFIG_W83977F_WDT is not set
# CONFIG_MACHZ_WDT is not set
# CONFIG_SBC_EPX_C3_WATCHDOG is not set
#
# PCI-based Watchdog Cards
#
# CONFIG_PCIPCWATCHDOG is not set
# CONFIG_WDTPCI is not set
#
# USB-based Watchdog Cards
#
# CONFIG_USBPCWATCHDOG is not set
CONFIG_SSB_POSSIBLE=y CONFIG_SSB_POSSIBLE=y
# #
@ -1637,10 +1681,9 @@ CONFIG_SSB_POSSIBLE=y
# #
CONFIG_SSB=y CONFIG_SSB=y
CONFIG_SSB_SPROM=y CONFIG_SSB_SPROM=y
CONFIG_SSB_BLOCKIO=y
CONFIG_SSB_PCIHOST_POSSIBLE=y CONFIG_SSB_PCIHOST_POSSIBLE=y
CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCIHOST=y
CONFIG_SSB_B43_PCI_BRIDGE=y # CONFIG_SSB_B43_PCI_BRIDGE is not set
# CONFIG_SSB_SILENT is not set # CONFIG_SSB_SILENT is not set
# CONFIG_SSB_DEBUG is not set # CONFIG_SSB_DEBUG is not set
CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y

8
projects/Fusion/linux/linux.i386.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/i386 3.7.5 Kernel Configuration # Linux/i386 3.7.6 Kernel Configuration
# #
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_X86_32=y CONFIG_X86_32=y
@ -1811,18 +1811,18 @@ CONFIG_THERMAL_HWMON=y
CONFIG_CPU_THERMAL=y CONFIG_CPU_THERMAL=y
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_CORE=y
# CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_NOWAYOUT=y
# #
# Watchdog Device Drivers # Watchdog Device Drivers
# #
# CONFIG_SOFT_WATCHDOG is not set CONFIG_SOFT_WATCHDOG=y
# CONFIG_ACQUIRE_WDT is not set # CONFIG_ACQUIRE_WDT is not set
# CONFIG_ADVANTECH_WDT is not set # CONFIG_ADVANTECH_WDT is not set
# CONFIG_ALIM1535_WDT is not set # CONFIG_ALIM1535_WDT is not set
# CONFIG_ALIM7101_WDT is not set # CONFIG_ALIM7101_WDT is not set
# CONFIG_F71808E_WDT is not set # CONFIG_F71808E_WDT is not set
CONFIG_SP5100_TCO=m # CONFIG_SP5100_TCO is not set
# CONFIG_SC520_WDT is not set # CONFIG_SC520_WDT is not set
# CONFIG_SBC_FITPC2_WATCHDOG is not set # CONFIG_SBC_FITPC2_WATCHDOG is not set
# CONFIG_EUROTECH_WDT is not set # CONFIG_EUROTECH_WDT is not set

8
projects/Fusion/linux/linux.x86_64.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86_64 3.7.5 Kernel Configuration # Linux/x86_64 3.7.6 Kernel Configuration
# #
CONFIG_64BIT=y CONFIG_64BIT=y
CONFIG_X86_64=y CONFIG_X86_64=y
@ -1765,18 +1765,18 @@ CONFIG_THERMAL_HWMON=y
CONFIG_CPU_THERMAL=y CONFIG_CPU_THERMAL=y
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_CORE=y
# CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_NOWAYOUT=y
# #
# Watchdog Device Drivers # Watchdog Device Drivers
# #
# CONFIG_SOFT_WATCHDOG is not set CONFIG_SOFT_WATCHDOG=y
# CONFIG_ACQUIRE_WDT is not set # CONFIG_ACQUIRE_WDT is not set
# CONFIG_ADVANTECH_WDT is not set # CONFIG_ADVANTECH_WDT is not set
# CONFIG_ALIM1535_WDT is not set # CONFIG_ALIM1535_WDT is not set
# CONFIG_ALIM7101_WDT is not set # CONFIG_ALIM7101_WDT is not set
# CONFIG_F71808E_WDT is not set # CONFIG_F71808E_WDT is not set
CONFIG_SP5100_TCO=m # CONFIG_SP5100_TCO is not set
# CONFIG_SC520_WDT is not set # CONFIG_SC520_WDT is not set
# CONFIG_SBC_FITPC2_WATCHDOG is not set # CONFIG_SBC_FITPC2_WATCHDOG is not set
# CONFIG_EUROTECH_WDT is not set # CONFIG_EUROTECH_WDT is not set

11
projects/Generic/linux/linux.i386.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/i386 3.7.3 Kernel Configuration # Linux/i386 3.7.6 Kernel Configuration
# #
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_X86_32=y CONFIG_X86_32=y
@ -1895,18 +1895,18 @@ CONFIG_THERMAL_HWMON=y
CONFIG_CPU_THERMAL=y CONFIG_CPU_THERMAL=y
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_CORE=y
# CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_NOWAYOUT=y
# #
# Watchdog Device Drivers # Watchdog Device Drivers
# #
# CONFIG_SOFT_WATCHDOG is not set CONFIG_SOFT_WATCHDOG=y
# CONFIG_ACQUIRE_WDT is not set # CONFIG_ACQUIRE_WDT is not set
# CONFIG_ADVANTECH_WDT is not set # CONFIG_ADVANTECH_WDT is not set
# CONFIG_ALIM1535_WDT is not set # CONFIG_ALIM1535_WDT is not set
# CONFIG_ALIM7101_WDT is not set # CONFIG_ALIM7101_WDT is not set
# CONFIG_F71808E_WDT is not set # CONFIG_F71808E_WDT is not set
CONFIG_SP5100_TCO=m # CONFIG_SP5100_TCO is not set
# CONFIG_SC520_WDT is not set # CONFIG_SC520_WDT is not set
# CONFIG_SBC_FITPC2_WATCHDOG is not set # CONFIG_SBC_FITPC2_WATCHDOG is not set
# CONFIG_EUROTECH_WDT is not set # CONFIG_EUROTECH_WDT is not set
@ -1918,8 +1918,7 @@ CONFIG_SP5100_TCO=m
# CONFIG_ITCO_WDT is not set # CONFIG_ITCO_WDT is not set
# CONFIG_IT8712F_WDT is not set # CONFIG_IT8712F_WDT is not set
# CONFIG_IT87_WDT is not set # CONFIG_IT87_WDT is not set
CONFIG_HP_WATCHDOG=m # CONFIG_HP_WATCHDOG is not set
CONFIG_HPWDT_NMI_DECODING=y
# CONFIG_SC1200_WDT is not set # CONFIG_SC1200_WDT is not set
# CONFIG_PC87413_WDT is not set # CONFIG_PC87413_WDT is not set
# CONFIG_NV_TCO is not set # CONFIG_NV_TCO is not set

11
projects/Generic_OSS/linux/linux.i386.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/i386 3.7.3 Kernel Configuration # Linux/i386 3.7.6 Kernel Configuration
# #
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_X86_32=y CONFIG_X86_32=y
@ -1893,18 +1893,18 @@ CONFIG_THERMAL_HWMON=y
CONFIG_CPU_THERMAL=y CONFIG_CPU_THERMAL=y
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_CORE=y
# CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_NOWAYOUT=y
# #
# Watchdog Device Drivers # Watchdog Device Drivers
# #
# CONFIG_SOFT_WATCHDOG is not set CONFIG_SOFT_WATCHDOG=y
# CONFIG_ACQUIRE_WDT is not set # CONFIG_ACQUIRE_WDT is not set
# CONFIG_ADVANTECH_WDT is not set # CONFIG_ADVANTECH_WDT is not set
# CONFIG_ALIM1535_WDT is not set # CONFIG_ALIM1535_WDT is not set
# CONFIG_ALIM7101_WDT is not set # CONFIG_ALIM7101_WDT is not set
# CONFIG_F71808E_WDT is not set # CONFIG_F71808E_WDT is not set
CONFIG_SP5100_TCO=m # CONFIG_SP5100_TCO is not set
# CONFIG_SC520_WDT is not set # CONFIG_SC520_WDT is not set
# CONFIG_SBC_FITPC2_WATCHDOG is not set # CONFIG_SBC_FITPC2_WATCHDOG is not set
# CONFIG_EUROTECH_WDT is not set # CONFIG_EUROTECH_WDT is not set
@ -1916,8 +1916,7 @@ CONFIG_SP5100_TCO=m
# CONFIG_ITCO_WDT is not set # CONFIG_ITCO_WDT is not set
# CONFIG_IT8712F_WDT is not set # CONFIG_IT8712F_WDT is not set
# CONFIG_IT87_WDT is not set # CONFIG_IT87_WDT is not set
CONFIG_HP_WATCHDOG=m # CONFIG_HP_WATCHDOG is not set
CONFIG_HPWDT_NMI_DECODING=y
# CONFIG_SC1200_WDT is not set # CONFIG_SC1200_WDT is not set
# CONFIG_PC87413_WDT is not set # CONFIG_PC87413_WDT is not set
# CONFIG_NV_TCO is not set # CONFIG_NV_TCO is not set

60
projects/ION/linux/linux.i386.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/i386 3.7.3 Kernel Configuration # Linux/i386 3.7.6 Kernel Configuration
# #
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_X86_32=y CONFIG_X86_32=y
@ -938,6 +938,7 @@ CONFIG_EEPROM_93CX6=m
# Altera FPGA firmware download module # Altera FPGA firmware download module
# #
CONFIG_ALTERA_STAPL=m CONFIG_ALTERA_STAPL=m
# CONFIG_INTEL_MEI is not set
CONFIG_HAVE_IDE=y CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set # CONFIG_IDE is not set
@ -1783,6 +1784,8 @@ CONFIG_SENSORS_CORETEMP=m
# CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47M192 is not set
# CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_SMSC47B397 is not set
# CONFIG_SENSORS_SCH56XX_COMMON is not set # CONFIG_SENSORS_SCH56XX_COMMON is not set
# CONFIG_SENSORS_SCH5627 is not set
# CONFIG_SENSORS_SCH5636 is not set
# CONFIG_SENSORS_ADS1015 is not set # CONFIG_SENSORS_ADS1015 is not set
# CONFIG_SENSORS_ADS7828 is not set # CONFIG_SENSORS_ADS7828 is not set
# CONFIG_SENSORS_AMC6821 is not set # CONFIG_SENSORS_AMC6821 is not set
@ -1814,7 +1817,60 @@ CONFIG_SENSORS_W83627EHF=y
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_HWMON=y
CONFIG_CPU_THERMAL=y CONFIG_CPU_THERMAL=y
# CONFIG_WATCHDOG is not set CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
CONFIG_WATCHDOG_NOWAYOUT=y
#
# Watchdog Device Drivers
#
CONFIG_SOFT_WATCHDOG=y
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_ADVANTECH_WDT is not set
# CONFIG_ALIM1535_WDT is not set
# CONFIG_ALIM7101_WDT is not set
# CONFIG_F71808E_WDT is not set
# CONFIG_SP5100_TCO is not set
# CONFIG_SC520_WDT is not set
# CONFIG_SBC_FITPC2_WATCHDOG is not set
# CONFIG_EUROTECH_WDT is not set
# CONFIG_IB700_WDT is not set
# CONFIG_IBMASR is not set
# CONFIG_WAFER_WDT is not set
# CONFIG_I6300ESB_WDT is not set
# CONFIG_IE6XX_WDT is not set
# CONFIG_ITCO_WDT is not set
# CONFIG_IT8712F_WDT is not set
# CONFIG_IT87_WDT is not set
# CONFIG_HP_WATCHDOG is not set
# CONFIG_SC1200_WDT is not set
# CONFIG_PC87413_WDT is not set
# CONFIG_NV_TCO is not set
# CONFIG_60XX_WDT is not set
# CONFIG_SBC8360_WDT is not set
# CONFIG_SBC7240_WDT is not set
# CONFIG_CPU5_WDT is not set
# CONFIG_SMSC_SCH311X_WDT is not set
# CONFIG_SMSC37B787_WDT is not set
# CONFIG_VIA_WDT is not set
# CONFIG_W83627HF_WDT is not set
# CONFIG_W83697HF_WDT is not set
# CONFIG_W83697UG_WDT is not set
# CONFIG_W83877F_WDT is not set
# CONFIG_W83977F_WDT is not set
# CONFIG_MACHZ_WDT is not set
# CONFIG_SBC_EPX_C3_WATCHDOG is not set
#
# PCI-based Watchdog Cards
#
# CONFIG_PCIPCWATCHDOG is not set
# CONFIG_WDTPCI is not set
#
# USB-based Watchdog Cards
#
# CONFIG_USBPCWATCHDOG is not set
CONFIG_SSB_POSSIBLE=y CONFIG_SSB_POSSIBLE=y
# #

59
projects/ION/linux/linux.x86_64.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86_64 3.7.3 Kernel Configuration # Linux/x86_64 3.7.6 Kernel Configuration
# #
CONFIG_64BIT=y CONFIG_64BIT=y
CONFIG_X86_64=y CONFIG_X86_64=y
@ -887,6 +887,7 @@ CONFIG_EEPROM_93CX6=m
# Altera FPGA firmware download module # Altera FPGA firmware download module
# #
CONFIG_ALTERA_STAPL=m CONFIG_ALTERA_STAPL=m
# CONFIG_INTEL_MEI is not set
CONFIG_HAVE_IDE=y CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set # CONFIG_IDE is not set
@ -1720,6 +1721,8 @@ CONFIG_SENSORS_CORETEMP=m
# CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47M192 is not set
# CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_SMSC47B397 is not set
# CONFIG_SENSORS_SCH56XX_COMMON is not set # CONFIG_SENSORS_SCH56XX_COMMON is not set
# CONFIG_SENSORS_SCH5627 is not set
# CONFIG_SENSORS_SCH5636 is not set
# CONFIG_SENSORS_ADS1015 is not set # CONFIG_SENSORS_ADS1015 is not set
# CONFIG_SENSORS_ADS7828 is not set # CONFIG_SENSORS_ADS7828 is not set
# CONFIG_SENSORS_AMC6821 is not set # CONFIG_SENSORS_AMC6821 is not set
@ -1751,7 +1754,59 @@ CONFIG_SENSORS_W83627EHF=y
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_HWMON=y
CONFIG_CPU_THERMAL=y CONFIG_CPU_THERMAL=y
# CONFIG_WATCHDOG is not set CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
CONFIG_WATCHDOG_NOWAYOUT=y
#
# Watchdog Device Drivers
#
CONFIG_SOFT_WATCHDOG=y
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_ADVANTECH_WDT is not set
# CONFIG_ALIM1535_WDT is not set
# CONFIG_ALIM7101_WDT is not set
# CONFIG_F71808E_WDT is not set
# CONFIG_SP5100_TCO is not set
# CONFIG_SC520_WDT is not set
# CONFIG_SBC_FITPC2_WATCHDOG is not set
# CONFIG_EUROTECH_WDT is not set
# CONFIG_IB700_WDT is not set
# CONFIG_IBMASR is not set
# CONFIG_WAFER_WDT is not set
# CONFIG_I6300ESB_WDT is not set
# CONFIG_IE6XX_WDT is not set
# CONFIG_ITCO_WDT is not set
# CONFIG_IT8712F_WDT is not set
# CONFIG_IT87_WDT is not set
# CONFIG_HP_WATCHDOG is not set
# CONFIG_SC1200_WDT is not set
# CONFIG_PC87413_WDT is not set
# CONFIG_NV_TCO is not set
# CONFIG_60XX_WDT is not set
# CONFIG_SBC8360_WDT is not set
# CONFIG_CPU5_WDT is not set
# CONFIG_SMSC_SCH311X_WDT is not set
# CONFIG_SMSC37B787_WDT is not set
# CONFIG_VIA_WDT is not set
# CONFIG_W83627HF_WDT is not set
# CONFIG_W83697HF_WDT is not set
# CONFIG_W83697UG_WDT is not set
# CONFIG_W83877F_WDT is not set
# CONFIG_W83977F_WDT is not set
# CONFIG_MACHZ_WDT is not set
# CONFIG_SBC_EPX_C3_WATCHDOG is not set
#
# PCI-based Watchdog Cards
#
# CONFIG_PCIPCWATCHDOG is not set
# CONFIG_WDTPCI is not set
#
# USB-based Watchdog Cards
#
# CONFIG_USBPCWATCHDOG is not set
CONFIG_SSB_POSSIBLE=y CONFIG_SSB_POSSIBLE=y
# #

60
projects/Intel/linux/linux.i386.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/i386 3.7.3 Kernel Configuration # Linux/i386 3.7.6 Kernel Configuration
# #
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_X86_32=y CONFIG_X86_32=y
@ -940,6 +940,7 @@ CONFIG_EEPROM_93CX6=m
# Altera FPGA firmware download module # Altera FPGA firmware download module
# #
CONFIG_ALTERA_STAPL=m CONFIG_ALTERA_STAPL=m
# CONFIG_INTEL_MEI is not set
CONFIG_HAVE_IDE=y CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set # CONFIG_IDE is not set
@ -1800,6 +1801,8 @@ CONFIG_SENSORS_CORETEMP=m
# CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47M192 is not set
# CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_SMSC47B397 is not set
# CONFIG_SENSORS_SCH56XX_COMMON is not set # CONFIG_SENSORS_SCH56XX_COMMON is not set
# CONFIG_SENSORS_SCH5627 is not set
# CONFIG_SENSORS_SCH5636 is not set
# CONFIG_SENSORS_ADS1015 is not set # CONFIG_SENSORS_ADS1015 is not set
# CONFIG_SENSORS_ADS7828 is not set # CONFIG_SENSORS_ADS7828 is not set
# CONFIG_SENSORS_AMC6821 is not set # CONFIG_SENSORS_AMC6821 is not set
@ -1831,7 +1834,60 @@ CONFIG_SENSORS_W83627EHF=y
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_HWMON=y
CONFIG_CPU_THERMAL=y CONFIG_CPU_THERMAL=y
# CONFIG_WATCHDOG is not set CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
CONFIG_WATCHDOG_NOWAYOUT=y
#
# Watchdog Device Drivers
#
CONFIG_SOFT_WATCHDOG=y
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_ADVANTECH_WDT is not set
# CONFIG_ALIM1535_WDT is not set
# CONFIG_ALIM7101_WDT is not set
# CONFIG_F71808E_WDT is not set
# CONFIG_SP5100_TCO is not set
# CONFIG_SC520_WDT is not set
# CONFIG_SBC_FITPC2_WATCHDOG is not set
# CONFIG_EUROTECH_WDT is not set
# CONFIG_IB700_WDT is not set
# CONFIG_IBMASR is not set
# CONFIG_WAFER_WDT is not set
# CONFIG_I6300ESB_WDT is not set
# CONFIG_IE6XX_WDT is not set
# CONFIG_ITCO_WDT is not set
# CONFIG_IT8712F_WDT is not set
# CONFIG_IT87_WDT is not set
# CONFIG_HP_WATCHDOG is not set
# CONFIG_SC1200_WDT is not set
# CONFIG_PC87413_WDT is not set
# CONFIG_NV_TCO is not set
# CONFIG_60XX_WDT is not set
# CONFIG_SBC8360_WDT is not set
# CONFIG_SBC7240_WDT is not set
# CONFIG_CPU5_WDT is not set
# CONFIG_SMSC_SCH311X_WDT is not set
# CONFIG_SMSC37B787_WDT is not set
# CONFIG_VIA_WDT is not set
# CONFIG_W83627HF_WDT is not set
# CONFIG_W83697HF_WDT is not set
# CONFIG_W83697UG_WDT is not set
# CONFIG_W83877F_WDT is not set
# CONFIG_W83977F_WDT is not set
# CONFIG_MACHZ_WDT is not set
# CONFIG_SBC_EPX_C3_WATCHDOG is not set
#
# PCI-based Watchdog Cards
#
# CONFIG_PCIPCWATCHDOG is not set
# CONFIG_WDTPCI is not set
#
# USB-based Watchdog Cards
#
# CONFIG_USBPCWATCHDOG is not set
CONFIG_SSB_POSSIBLE=y CONFIG_SSB_POSSIBLE=y
# #

59
projects/Intel/linux/linux.x86_64.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86_64 3.7.3 Kernel Configuration # Linux/x86_64 3.7.6 Kernel Configuration
# #
CONFIG_64BIT=y CONFIG_64BIT=y
CONFIG_X86_64=y CONFIG_X86_64=y
@ -890,6 +890,7 @@ CONFIG_EEPROM_93CX6=m
# Altera FPGA firmware download module # Altera FPGA firmware download module
# #
CONFIG_ALTERA_STAPL=m CONFIG_ALTERA_STAPL=m
# CONFIG_INTEL_MEI is not set
CONFIG_HAVE_IDE=y CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set # CONFIG_IDE is not set
@ -1738,6 +1739,8 @@ CONFIG_SENSORS_CORETEMP=m
# CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47M192 is not set
# CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_SMSC47B397 is not set
# CONFIG_SENSORS_SCH56XX_COMMON is not set # CONFIG_SENSORS_SCH56XX_COMMON is not set
# CONFIG_SENSORS_SCH5627 is not set
# CONFIG_SENSORS_SCH5636 is not set
# CONFIG_SENSORS_ADS1015 is not set # CONFIG_SENSORS_ADS1015 is not set
# CONFIG_SENSORS_ADS7828 is not set # CONFIG_SENSORS_ADS7828 is not set
# CONFIG_SENSORS_AMC6821 is not set # CONFIG_SENSORS_AMC6821 is not set
@ -1769,7 +1772,59 @@ CONFIG_SENSORS_W83627EHF=y
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_HWMON=y
CONFIG_CPU_THERMAL=y CONFIG_CPU_THERMAL=y
# CONFIG_WATCHDOG is not set CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
CONFIG_WATCHDOG_NOWAYOUT=y
#
# Watchdog Device Drivers
#
CONFIG_SOFT_WATCHDOG=y
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_ADVANTECH_WDT is not set
# CONFIG_ALIM1535_WDT is not set
# CONFIG_ALIM7101_WDT is not set
# CONFIG_F71808E_WDT is not set
# CONFIG_SP5100_TCO is not set
# CONFIG_SC520_WDT is not set
# CONFIG_SBC_FITPC2_WATCHDOG is not set
# CONFIG_EUROTECH_WDT is not set
# CONFIG_IB700_WDT is not set
# CONFIG_IBMASR is not set
# CONFIG_WAFER_WDT is not set
# CONFIG_I6300ESB_WDT is not set
# CONFIG_IE6XX_WDT is not set
# CONFIG_ITCO_WDT is not set
# CONFIG_IT8712F_WDT is not set
# CONFIG_IT87_WDT is not set
# CONFIG_HP_WATCHDOG is not set
# CONFIG_SC1200_WDT is not set
# CONFIG_PC87413_WDT is not set
# CONFIG_NV_TCO is not set
# CONFIG_60XX_WDT is not set
# CONFIG_SBC8360_WDT is not set
# CONFIG_CPU5_WDT is not set
# CONFIG_SMSC_SCH311X_WDT is not set
# CONFIG_SMSC37B787_WDT is not set
# CONFIG_VIA_WDT is not set
# CONFIG_W83627HF_WDT is not set
# CONFIG_W83697HF_WDT is not set
# CONFIG_W83697UG_WDT is not set
# CONFIG_W83877F_WDT is not set
# CONFIG_W83977F_WDT is not set
# CONFIG_MACHZ_WDT is not set
# CONFIG_SBC_EPX_C3_WATCHDOG is not set
#
# PCI-based Watchdog Cards
#
# CONFIG_PCIPCWATCHDOG is not set
# CONFIG_WDTPCI is not set
#
# USB-based Watchdog Cards
#
# CONFIG_USBPCWATCHDOG is not set
CONFIG_SSB_POSSIBLE=y CONFIG_SSB_POSSIBLE=y
# #

2
projects/RPi/xbmc/advancedsettings.xml
View File

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<advancedsettings> <advancedsettings>
<!--<loglevel>1</loglevel>-->
<splash>false</splash>
<cputempcommand>cputemp</cputempcommand> <cputempcommand>cputemp</cputempcommand>
<gputempcommand>cputemp</gputempcommand> <gputempcommand>cputemp</gputempcommand>
<showexitbutton>false</showexitbutton> <showexitbutton>false</showexitbutton>

59
projects/Ultra/linux/linux.x86_64.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86_64 3.7.3 Kernel Configuration # Linux/x86_64 3.7.6 Kernel Configuration
# #
CONFIG_64BIT=y CONFIG_64BIT=y
CONFIG_X86_64=y CONFIG_X86_64=y
@ -882,6 +882,7 @@ CONFIG_EEPROM_93CX6=m
# Altera FPGA firmware download module # Altera FPGA firmware download module
# #
CONFIG_ALTERA_STAPL=m CONFIG_ALTERA_STAPL=m
# CONFIG_INTEL_MEI is not set
CONFIG_HAVE_IDE=y CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set # CONFIG_IDE is not set
@ -1643,6 +1644,8 @@ CONFIG_SENSORS_CORETEMP=y
# CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47M192 is not set
# CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_SMSC47B397 is not set
# CONFIG_SENSORS_SCH56XX_COMMON is not set # CONFIG_SENSORS_SCH56XX_COMMON is not set
# CONFIG_SENSORS_SCH5627 is not set
# CONFIG_SENSORS_SCH5636 is not set
# CONFIG_SENSORS_ADS1015 is not set # CONFIG_SENSORS_ADS1015 is not set
# CONFIG_SENSORS_ADS7828 is not set # CONFIG_SENSORS_ADS7828 is not set
# CONFIG_SENSORS_AMC6821 is not set # CONFIG_SENSORS_AMC6821 is not set
@ -1674,7 +1677,59 @@ CONFIG_SENSORS_W83627EHF=y
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_HWMON=y
CONFIG_CPU_THERMAL=y CONFIG_CPU_THERMAL=y
# CONFIG_WATCHDOG is not set CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
CONFIG_WATCHDOG_NOWAYOUT=y
#
# Watchdog Device Drivers
#
CONFIG_SOFT_WATCHDOG=y
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_ADVANTECH_WDT is not set
# CONFIG_ALIM1535_WDT is not set
# CONFIG_ALIM7101_WDT is not set
# CONFIG_F71808E_WDT is not set
# CONFIG_SP5100_TCO is not set
# CONFIG_SC520_WDT is not set
# CONFIG_SBC_FITPC2_WATCHDOG is not set
# CONFIG_EUROTECH_WDT is not set
# CONFIG_IB700_WDT is not set
# CONFIG_IBMASR is not set
# CONFIG_WAFER_WDT is not set
# CONFIG_I6300ESB_WDT is not set
# CONFIG_IE6XX_WDT is not set
# CONFIG_ITCO_WDT is not set
# CONFIG_IT8712F_WDT is not set
# CONFIG_IT87_WDT is not set
# CONFIG_HP_WATCHDOG is not set
# CONFIG_SC1200_WDT is not set
# CONFIG_PC87413_WDT is not set
# CONFIG_NV_TCO is not set
# CONFIG_60XX_WDT is not set
# CONFIG_SBC8360_WDT is not set
# CONFIG_CPU5_WDT is not set
# CONFIG_SMSC_SCH311X_WDT is not set
# CONFIG_SMSC37B787_WDT is not set
# CONFIG_VIA_WDT is not set
# CONFIG_W83627HF_WDT is not set
# CONFIG_W83697HF_WDT is not set
# CONFIG_W83697UG_WDT is not set
# CONFIG_W83877F_WDT is not set
# CONFIG_W83977F_WDT is not set
# CONFIG_MACHZ_WDT is not set
# CONFIG_SBC_EPX_C3_WATCHDOG is not set
#
# PCI-based Watchdog Cards
#
# CONFIG_PCIPCWATCHDOG is not set
# CONFIG_WDTPCI is not set
#
# USB-based Watchdog Cards
#
# CONFIG_USBPCWATCHDOG is not set
CONFIG_SSB_POSSIBLE=y CONFIG_SSB_POSSIBLE=y
# #

60
projects/Virtual/linux/linux.i386.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/i386 3.7.3 Kernel Configuration # Linux/i386 3.7.6 Kernel Configuration
# #
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_X86_32=y CONFIG_X86_32=y
@ -938,6 +938,7 @@ CONFIG_EEPROM_93CX6=m
# Altera FPGA firmware download module # Altera FPGA firmware download module
# #
CONFIG_ALTERA_STAPL=m CONFIG_ALTERA_STAPL=m
# CONFIG_INTEL_MEI is not set
CONFIG_HAVE_IDE=y CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set # CONFIG_IDE is not set
@ -1802,6 +1803,8 @@ CONFIG_SENSORS_CORETEMP=m
# CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47M192 is not set
# CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_SMSC47B397 is not set
# CONFIG_SENSORS_SCH56XX_COMMON is not set # CONFIG_SENSORS_SCH56XX_COMMON is not set
# CONFIG_SENSORS_SCH5627 is not set
# CONFIG_SENSORS_SCH5636 is not set
# CONFIG_SENSORS_ADS1015 is not set # CONFIG_SENSORS_ADS1015 is not set
# CONFIG_SENSORS_ADS7828 is not set # CONFIG_SENSORS_ADS7828 is not set
# CONFIG_SENSORS_AMC6821 is not set # CONFIG_SENSORS_AMC6821 is not set
@ -1833,7 +1836,60 @@ CONFIG_SENSORS_W83627EHF=y
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_HWMON=y
CONFIG_CPU_THERMAL=y CONFIG_CPU_THERMAL=y
# CONFIG_WATCHDOG is not set CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
CONFIG_WATCHDOG_NOWAYOUT=y
#
# Watchdog Device Drivers
#
CONFIG_SOFT_WATCHDOG=y
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_ADVANTECH_WDT is not set
# CONFIG_ALIM1535_WDT is not set
# CONFIG_ALIM7101_WDT is not set
# CONFIG_F71808E_WDT is not set
# CONFIG_SP5100_TCO is not set
# CONFIG_SC520_WDT is not set
# CONFIG_SBC_FITPC2_WATCHDOG is not set
# CONFIG_EUROTECH_WDT is not set
# CONFIG_IB700_WDT is not set
# CONFIG_IBMASR is not set
# CONFIG_WAFER_WDT is not set
# CONFIG_I6300ESB_WDT is not set
# CONFIG_IE6XX_WDT is not set
# CONFIG_ITCO_WDT is not set
# CONFIG_IT8712F_WDT is not set
# CONFIG_IT87_WDT is not set
# CONFIG_HP_WATCHDOG is not set
# CONFIG_SC1200_WDT is not set
# CONFIG_PC87413_WDT is not set
# CONFIG_NV_TCO is not set
# CONFIG_60XX_WDT is not set
# CONFIG_SBC8360_WDT is not set
# CONFIG_SBC7240_WDT is not set
# CONFIG_CPU5_WDT is not set
# CONFIG_SMSC_SCH311X_WDT is not set
# CONFIG_SMSC37B787_WDT is not set
# CONFIG_VIA_WDT is not set
# CONFIG_W83627HF_WDT is not set
# CONFIG_W83697HF_WDT is not set
# CONFIG_W83697UG_WDT is not set
# CONFIG_W83877F_WDT is not set
# CONFIG_W83977F_WDT is not set
# CONFIG_MACHZ_WDT is not set
# CONFIG_SBC_EPX_C3_WATCHDOG is not set
#
# PCI-based Watchdog Cards
#
# CONFIG_PCIPCWATCHDOG is not set
# CONFIG_WDTPCI is not set
#
# USB-based Watchdog Cards
#
# CONFIG_USBPCWATCHDOG is not set
CONFIG_SSB_POSSIBLE=y CONFIG_SSB_POSSIBLE=y
# #

59
projects/Virtual/linux/linux.x86_64.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86_64 3.7.3 Kernel Configuration # Linux/x86_64 3.7.6 Kernel Configuration
# #
CONFIG_64BIT=y CONFIG_64BIT=y
CONFIG_X86_64=y CONFIG_X86_64=y
@ -887,6 +887,7 @@ CONFIG_EEPROM_93CX6=m
# Altera FPGA firmware download module # Altera FPGA firmware download module
# #
CONFIG_ALTERA_STAPL=m CONFIG_ALTERA_STAPL=m
# CONFIG_INTEL_MEI is not set
CONFIG_HAVE_IDE=y CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set # CONFIG_IDE is not set
@ -1739,6 +1740,8 @@ CONFIG_SENSORS_CORETEMP=m
# CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47M192 is not set
# CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_SMSC47B397 is not set
# CONFIG_SENSORS_SCH56XX_COMMON is not set # CONFIG_SENSORS_SCH56XX_COMMON is not set
# CONFIG_SENSORS_SCH5627 is not set
# CONFIG_SENSORS_SCH5636 is not set
# CONFIG_SENSORS_ADS1015 is not set # CONFIG_SENSORS_ADS1015 is not set
# CONFIG_SENSORS_ADS7828 is not set # CONFIG_SENSORS_ADS7828 is not set
# CONFIG_SENSORS_AMC6821 is not set # CONFIG_SENSORS_AMC6821 is not set
@ -1770,7 +1773,59 @@ CONFIG_SENSORS_W83627EHF=y
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_HWMON=y
CONFIG_CPU_THERMAL=y CONFIG_CPU_THERMAL=y
# CONFIG_WATCHDOG is not set CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
CONFIG_WATCHDOG_NOWAYOUT=y
#
# Watchdog Device Drivers
#
CONFIG_SOFT_WATCHDOG=y
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_ADVANTECH_WDT is not set
# CONFIG_ALIM1535_WDT is not set
# CONFIG_ALIM7101_WDT is not set
# CONFIG_F71808E_WDT is not set
# CONFIG_SP5100_TCO is not set
# CONFIG_SC520_WDT is not set
# CONFIG_SBC_FITPC2_WATCHDOG is not set
# CONFIG_EUROTECH_WDT is not set
# CONFIG_IB700_WDT is not set
# CONFIG_IBMASR is not set
# CONFIG_WAFER_WDT is not set
# CONFIG_I6300ESB_WDT is not set
# CONFIG_IE6XX_WDT is not set
# CONFIG_ITCO_WDT is not set
# CONFIG_IT8712F_WDT is not set
# CONFIG_IT87_WDT is not set
# CONFIG_HP_WATCHDOG is not set
# CONFIG_SC1200_WDT is not set
# CONFIG_PC87413_WDT is not set
# CONFIG_NV_TCO is not set
# CONFIG_60XX_WDT is not set
# CONFIG_SBC8360_WDT is not set
# CONFIG_CPU5_WDT is not set
# CONFIG_SMSC_SCH311X_WDT is not set
# CONFIG_SMSC37B787_WDT is not set
# CONFIG_VIA_WDT is not set
# CONFIG_W83627HF_WDT is not set
# CONFIG_W83697HF_WDT is not set
# CONFIG_W83697UG_WDT is not set
# CONFIG_W83877F_WDT is not set
# CONFIG_W83977F_WDT is not set
# CONFIG_MACHZ_WDT is not set
# CONFIG_SBC_EPX_C3_WATCHDOG is not set
#
# PCI-based Watchdog Cards
#
# CONFIG_PCIPCWATCHDOG is not set
# CONFIG_WDTPCI is not set
#
# USB-based Watchdog Cards
#
# CONFIG_USBPCWATCHDOG is not set
CONFIG_SSB_POSSIBLE=y CONFIG_SSB_POSSIBLE=y
# #

15
tools/mkpkg/mkpkg_xbmc-frodo
View File

@ -20,7 +20,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc" PKG_NAME="xbmc"
PKG_VERSION="" PKG_VERSION="12.0.1"
GIT_REPO="-b Frodo git://github.com/xbmc/xbmc.git" GIT_REPO="-b Frodo git://github.com/xbmc/xbmc.git"
DEST_DIR="$PKG_NAME-frodo" DEST_DIR="$PKG_NAME-frodo"
@ -32,16 +32,19 @@ echo "getting sources..."
cd $DEST_DIR-latest cd $DEST_DIR-latest
git pull git pull
echo "getting version..." echo "getting version..."
GIT_REV=`git log -n1 --format=%h` GIT_REV=`git log -n1 --format=%h`
echo $GIT_REV echo $GIT_REV
cd .. cd ..
PKG_VERSION="$GIT_REV"
if [ -z "$PKG_VERSION" ]; then
PKG_VERSION="$GIT_REV"
fi
echo "copying sources..." echo "copying sources..."
rm -rf $PKG_NAME-$PKG_VERSION rm -rf $PKG_NAME-$PKG_VERSION
cp -R $DEST_DIR-latest $PKG_NAME-$PKG_VERSION cp -R $DEST_DIR-latest $PKG_NAME-$PKG_VERSION
echo "$GIT_REV" > $PKG_NAME-$PKG_VERSION/git.version echo "$GIT_REV" > $PKG_NAME-$PKG_VERSION/VERSION
echo "cleaning sources..." echo "cleaning sources..."
rm -rf $PKG_NAME-$PKG_VERSION/.git rm -rf $PKG_NAME-$PKG_VERSION/.git