Merge branch 'next' of 109.75.98.228:cst-private-neutrino into next

This commit is contained in:
[CST] Focus
2013-02-04 11:02:51 +04:00
2 changed files with 3 additions and 4 deletions

View File

@@ -495,11 +495,9 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
void CFanControlNotifier::setSpeed(unsigned int speed)
{
#ifndef BOXMODEL_APOLLO
int cfd;
printf("FAN Speed %d\n", speed);
cfd = open("/dev/cs_control", O_RDONLY);
#ifndef BOXMODEL_APOLLO
int cfd = open("/dev/cs_control", O_RDONLY);
if(cfd < 0) {
perror("Cannot open /dev/cs_control");
return;

View File

@@ -113,6 +113,7 @@ CFEManager::~CFEManager()
{
for(fe_map_iterator_t it = femap.begin(); it != femap.end(); it++)
delete it->second;
dmap.clear();
}
CFEManager * CFEManager::getInstance()