|
@@ -16,60 +16,96 @@
|
|
|
#include "ktiva.h"
|
|
|
#include "sfsattrib.h"
|
|
|
#include "kfirmware.h"
|
|
|
+#include "ksync.h"
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
MODULE_LICENSE("Dual BSD/GPL");
|
|
|
MODULE_AUTHOR("GfA");
|
|
|
|
|
|
-#define _THREAD_DELAY_JIFFIES 5
|
|
|
+#define _SLEEP_DELAY_JIFFIES 5
|
|
|
#define _IS_REVIVE_STATE(ret) ((ret) != -ECOMM)
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
// sys fs
|
|
|
|
|
|
-static struct kobject *g_pKoGfa = NULL, *g_pKoTiva = NULL;
|
|
|
+static struct kobject *g_pKoGfa = NULL, *g_pKoTiva = NULL, *g_pKoBacklight = NULL, *g_pKoADC = NULL, *g_pKoFirmware = NULL;
|
|
|
static bool g_bHasFwVersion = false;
|
|
|
+static atomic_t g_flgSysFsRunning;
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
// worker threads
|
|
|
|
|
|
static void _SysFsWorkProc(struct work_struct *work);
|
|
|
static void _FwUploadWorkProc(struct work_struct *work);
|
|
|
+static void _BacklightWorkProc(struct work_struct *work);
|
|
|
|
|
|
static struct workqueue_struct *g_pwq = NULL;
|
|
|
static DECLARE_WORK(g_sysFsWorkObj, _SysFsWorkProc);
|
|
|
static DECLARE_WORK(g_fwUploadWorkObj, _FwUploadWorkProc);
|
|
|
+static DECLARE_WORK(g_backLightWorkObj, _BacklightWorkProc);
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
// timer
|
|
|
|
|
|
-static volatile bool g_bTimerRunning = false;
|
|
|
-static struct timer_list g_jiq_timer;
|
|
|
+static atomic_t g_flgTimerRunning;
|
|
|
+static struct timer_list g_timer_list;
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
typedef enum _WorkerState
|
|
|
{
|
|
|
WS_SysFs,
|
|
|
- WS_FwUpload
|
|
|
+ WS_FwUpload,
|
|
|
+ WS_Backlight,
|
|
|
+ WS_Idle
|
|
|
}WorkerState;
|
|
|
|
|
|
-static TIVA_UPLOAD_INFO g_tui;
|
|
|
+/////////////////////////////////////////////////////////////////////////////
|
|
|
+
|
|
|
+static bool _GetSysFsRunning(void)
|
|
|
+{
|
|
|
+ return !!atomic_read(&g_flgSysFsRunning);
|
|
|
+}
|
|
|
+
|
|
|
+/////////////////////////////////////////////////////////////////////////////
|
|
|
+
|
|
|
+static void _SetSysFsRunning(bool bRunning)
|
|
|
+{
|
|
|
+ atomic_set(&g_flgSysFsRunning, bRunning ? 1 : 0);
|
|
|
+}
|
|
|
+
|
|
|
+/////////////////////////////////////////////////////////////////////////////
|
|
|
+
|
|
|
+static bool _GetTimerRunning(void)
|
|
|
+{
|
|
|
+ return !!atomic_read(&g_flgTimerRunning);
|
|
|
+}
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
-static void OnJigTimer(unsigned long ptr)
|
|
|
+static void _SetTimerRunning(bool bRunning)
|
|
|
+{
|
|
|
+ atomic_set(&g_flgTimerRunning, bRunning ? 1 : 0);
|
|
|
+}
|
|
|
+
|
|
|
+/////////////////////////////////////////////////////////////////////////////
|
|
|
+
|
|
|
+static void _WorkScheduler(unsigned long ptr)
|
|
|
{
|
|
|
static unsigned int nPass = 0;
|
|
|
static WorkerState ws = WS_SysFs;
|
|
|
|
|
|
-// KALERT("%s: %d, %p\n", __FUNCTION__, g_bTimerRunning ? 1 : 0, g_pwq);
|
|
|
+// KALERT("%s: %d, %p\n", __FUNCTION__, _GetTimerRunning() ? 1 : 0, g_pwq);
|
|
|
|
|
|
- if(g_bTimerRunning && g_pwq)
|
|
|
+ if(_GetTimerRunning())
|
|
|
{
|
|
|
- if(KfwQueryUploadInfo(&g_tui))
|
|
|
+ if(KfwUploadInfoReady())
|
|
|
ws = WS_FwUpload;
|
|
|
+ else if(SfAttBacklightChanged())
|
|
|
+ ws = WS_Backlight;
|
|
|
+ else if(!_GetSysFsRunning())
|
|
|
+ ws = WS_Idle;
|
|
|
|
|
|
switch(ws)
|
|
|
{
|
|
@@ -85,9 +121,7 @@ static void OnJigTimer(unsigned long ptr)
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- mutex_lock(&g_mutex);
|
|
|
- mod_timer(&g_jiq_timer, _TIMER_INTERVAL);
|
|
|
- mutex_unlock(&g_mutex);
|
|
|
+ mod_timer(&g_timer_list, _TIMER_INTERVAL);
|
|
|
}
|
|
|
break;
|
|
|
case WS_FwUpload:
|
|
@@ -96,8 +130,18 @@ static void OnJigTimer(unsigned long ptr)
|
|
|
KALERT("%s: queue_work failed\n", __FUNCTION__);
|
|
|
}
|
|
|
ws = WS_SysFs;
|
|
|
-// nPass = 2;
|
|
|
- nPass = 1;
|
|
|
+ nPass = 2;
|
|
|
+ break;
|
|
|
+ case WS_Backlight:
|
|
|
+ if(!queue_work(g_pwq, &g_backLightWorkObj))
|
|
|
+ {
|
|
|
+ KALERT("%s: queue_work failed\n", __FUNCTION__);
|
|
|
+ }
|
|
|
+ ws = WS_SysFs;
|
|
|
+ nPass = 2;
|
|
|
+ break;
|
|
|
+ case WS_Idle:
|
|
|
+ mod_timer(&g_timer_list, _TIMER_INTERVAL);
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
@@ -109,74 +153,77 @@ static void OnJigTimer(unsigned long ptr)
|
|
|
// https://stackoverflow.com/questions/16367623/using-the-linux-sysfs-notify-call
|
|
|
//
|
|
|
|
|
|
-static void _FwUploadWorkProc(struct work_struct *work)
|
|
|
+static void _BacklightWorkProc(struct work_struct *work)
|
|
|
{
|
|
|
struct file *pfSpiDev = NULL;
|
|
|
- uint8_t mode = 0;
|
|
|
- uint8_t bits = 0;
|
|
|
- uint32_t speed = 0;
|
|
|
+ int ret;
|
|
|
|
|
|
if((pfSpiDev = kf_open(_SPI_DEVICE, O_RDWR, 0)))
|
|
|
{
|
|
|
do
|
|
|
{
|
|
|
- unsigned char stat = 0xFF;
|
|
|
-
|
|
|
- if(kspi_write_mode(pfSpiDev, SPI_MODE_3) < 0)
|
|
|
- {
|
|
|
- KALERT("%s: kspi_write_mode failed!\n", __FUNCTION__);
|
|
|
- break;
|
|
|
- }
|
|
|
+ unsigned int nFrequency = SfAttGetBacklightFrequency();
|
|
|
+ unsigned int nBrightness = SfAttGetBacklightBrightness();
|
|
|
|
|
|
- if(kspi_read_mode(pfSpiDev, &mode) < 0)
|
|
|
- {
|
|
|
- KALERT("%s: kspi_read_mode failed!\n", __FUNCTION__);
|
|
|
- break;
|
|
|
- }
|
|
|
+ /////////////////////////////////////////////////////////////////
|
|
|
|
|
|
- if(mode != SPI_MODE_3)
|
|
|
+ if(!KSpiInit(pfSpiDev))
|
|
|
{
|
|
|
- KALERT("%s: Invalid mode!\n", __FUNCTION__);
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////
|
|
|
|
|
|
- if(kspi_write_bits_per_word(pfSpiDev, _SPI_BITS_PER_WORD) < 0)
|
|
|
+ KALERT("%s: Set backlight frequency to %u Hz, brightness to %u %%\n", __FUNCTION__, nFrequency, nBrightness);
|
|
|
+ if((ret = TivaCmdSetBacklight(pfSpiDev, nFrequency, nBrightness)) != 0)
|
|
|
{
|
|
|
- KALERT("%s: kspi_write_bits_per_word failed!\n", __FUNCTION__);
|
|
|
+ KALERT("%s: TivaCmdSetBacklight failed: %d!\n", __FUNCTION__, ret);
|
|
|
break;
|
|
|
}
|
|
|
+ }
|
|
|
+ while(0);
|
|
|
|
|
|
- if(kspi_read_bits_per_word(pfSpiDev, &bits) < 0)
|
|
|
- {
|
|
|
- KALERT("%s: kspi_read_bits_per_word failed!\n", __FUNCTION__);
|
|
|
- break;
|
|
|
- }
|
|
|
+ kf_close(pfSpiDev);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ KALERT("%s: kf_open failed\n", __FUNCTION__);
|
|
|
+ }
|
|
|
|
|
|
- if(bits != _SPI_BITS_PER_WORD)
|
|
|
- {
|
|
|
- KALERT("%s: Invalid bits per word!\n", __FUNCTION__);
|
|
|
- break;
|
|
|
- }
|
|
|
+ if(_GetTimerRunning())
|
|
|
+ {
|
|
|
+ ksync_lock();
|
|
|
+ mod_timer(&g_timer_list, _TIMER_INTERVAL);
|
|
|
+ ksync_unlock();
|
|
|
+ }
|
|
|
+}
|
|
|
|
|
|
- /////////////////////////////////////////////////////////////////
|
|
|
+/////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
- if(kspi_write_max_speed_hz(pfSpiDev, _SPI_SPEED_HZ) < 0)
|
|
|
- {
|
|
|
- KALERT("%s: kspi_write_max_speed_hz failed!\n", __FUNCTION__);
|
|
|
- break;
|
|
|
- }
|
|
|
+static void _FwUploadWorkProc(struct work_struct *work)
|
|
|
+{
|
|
|
+ int nRet, i;
|
|
|
+ bool bSuccess = false, bReset = true;
|
|
|
+ unsigned long start = jiffies;
|
|
|
+ struct file *pfSpiDev = NULL;
|
|
|
+ TIVA_UPLOAD_INFO tui;
|
|
|
|
|
|
- if(kspi_read_max_speed_hz(pfSpiDev, &speed) < 0)
|
|
|
- {
|
|
|
- KALERT("%s: kspi_read_max_speed_hz failed!\n", __FUNCTION__);
|
|
|
- break;
|
|
|
- }
|
|
|
+ if(!KfwQueryUploadInfo(&tui))
|
|
|
+ {
|
|
|
+ KALERT("%s: Upload info not ready!!\n", __FUNCTION__);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ if((pfSpiDev = kf_open(_SPI_DEVICE, O_RDWR, 0)))
|
|
|
+ {
|
|
|
+ do
|
|
|
+ {
|
|
|
+ unsigned char stat = 0xFF;
|
|
|
+ size_t nCntBlocks, nCbToSend, nCbBlock, nCntFlashPages;
|
|
|
+ const unsigned char *pbToSend;
|
|
|
|
|
|
- if(speed != _SPI_SPEED_HZ)
|
|
|
+ if(!KSpiInit(pfSpiDev))
|
|
|
{
|
|
|
- KALERT("%s: Invalid max. speed!\n", __FUNCTION__);
|
|
|
break;
|
|
|
}
|
|
|
|
|
@@ -186,87 +233,170 @@ static void _FwUploadWorkProc(struct work_struct *work)
|
|
|
{
|
|
|
}
|
|
|
|
|
|
- if(TivaCmdStartBootloader(pfSpiDev) < 0)
|
|
|
+ if((nRet = TivaCmdStartBootloader(pfSpiDev)) < 0)
|
|
|
{
|
|
|
KALERT("%s: TivaCmdStartBootloader failed!\n", __FUNCTION__);
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
+ ksync_lock();
|
|
|
g_hw = -1;
|
|
|
g_sw = -1;
|
|
|
g_bHasFwVersion = false;
|
|
|
- sysfs_notify(g_pKoTiva, NULL, "version");
|
|
|
+ ksync_unlock();
|
|
|
+ sysfs_notify(g_pKoFirmware, NULL, "version");
|
|
|
|
|
|
KALERT("%s: Started bootloader!\n", __FUNCTION__);
|
|
|
- set_current_state(TASK_INTERRUPTIBLE);
|
|
|
- schedule_timeout(_THREAD_DELAY_JIFFIES);
|
|
|
+ ksync_sleep_jiffies(_SLEEP_DELAY_JIFFIES);
|
|
|
|
|
|
- if(TivaCmdGetBootloaderStatus(pfSpiDev, &stat) < 0)
|
|
|
+ if((nRet = TivaCmdGetBootloaderStatus(pfSpiDev, &stat)) < 0)
|
|
|
{
|
|
|
- KALERT("%s: TivaCmdGetStatus failed!\n", __FUNCTION__);
|
|
|
+ KALERT("%s: TivaCmdGetBootloaderStatus failed!\n", __FUNCTION__);
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- KALERT("%s: Status: 0x%02hhX\n", __FUNCTION__, stat);
|
|
|
- set_current_state(TASK_INTERRUPTIBLE);
|
|
|
- schedule_timeout(_THREAD_DELAY_JIFFIES);
|
|
|
+ KALERT("%s: Bootloader Status: 0x%02hhX\n", __FUNCTION__, stat);
|
|
|
+ ksync_sleep_jiffies(_SLEEP_DELAY_JIFFIES);
|
|
|
|
|
|
- if(TivaCmdPing(pfSpiDev) < 0)
|
|
|
+ if((nRet = TivaCmdPing(pfSpiDev)) < 0)
|
|
|
{
|
|
|
KALERT("%s: TivaCmdPing failed!\n", __FUNCTION__);
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- KALERT("%s: Ping success!\n", __FUNCTION__);
|
|
|
- set_current_state(TASK_INTERRUPTIBLE);
|
|
|
- schedule_timeout(_THREAD_DELAY_JIFFIES);
|
|
|
+ KALERT("%s: Bootloader Ping success!\n", __FUNCTION__);
|
|
|
+ ksync_sleep_jiffies(_SLEEP_DELAY_JIFFIES);
|
|
|
|
|
|
- if(TivaCmdGetBootloaderStatus(pfSpiDev, &stat) < 0)
|
|
|
+ if((nRet = TivaCmdGetBootloaderStatus(pfSpiDev, &stat)) < 0)
|
|
|
{
|
|
|
- KALERT("%s: TivaCmdGetStatus failed!\n", __FUNCTION__);
|
|
|
+ KALERT("%s: TivaCmdGetBootloaderStatus failed!\n", __FUNCTION__);
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- KALERT("%s: Status: 0x%02hhX\n", __FUNCTION__, stat);
|
|
|
- set_current_state(TASK_INTERRUPTIBLE);
|
|
|
- schedule_timeout(_THREAD_DELAY_JIFFIES);
|
|
|
+ KALERT("%s: Bootloader Status: 0x%02hhX\n", __FUNCTION__, stat);
|
|
|
+ ksync_sleep_jiffies(_SLEEP_DELAY_JIFFIES);
|
|
|
+
|
|
|
+ /////////////////////////////////////////////////////////////////
|
|
|
+
|
|
|
+ nCbToSend = (tui.nCbData + (KFW_MIN_UPLOAD_BLOCKSIZE - 1) / KFW_MIN_UPLOAD_BLOCKSIZE * KFW_MIN_UPLOAD_BLOCKSIZE);
|
|
|
+ pbToSend = (const unsigned char*)tui.pData;
|
|
|
+ nCntBlocks = (nCbToSend + KFW_DEFAULT_UPLOAD_BLOCKSIZE - 1) / KFW_DEFAULT_UPLOAD_BLOCKSIZE;
|
|
|
+ nCntFlashPages = (nCntBlocks * KFW_DEFAULT_UPLOAD_BLOCKSIZE + KFW_FLASH_PAGE_SIZE - 1) / KFW_FLASH_PAGE_SIZE;
|
|
|
+ KALERT("%s: Start Download of %zu Bytes (%zu Blocks) at Address 0x%08X\n", __FUNCTION__, nCbToSend, nCntBlocks, KFW_DEFAULT_BASE_ADDRESS);
|
|
|
|
|
|
- if(TivaCmdReset(pfSpiDev) < 0)
|
|
|
+ if((nRet = TivaCmdStartDownload(pfSpiDev, KFW_DEFAULT_BASE_ADDRESS, nCbToSend)) != 0)
|
|
|
{
|
|
|
- KALERT("%s: TivaCmdReset failed!\n", __FUNCTION__);
|
|
|
+ KALERT("%s: TivaCmdStartDownload failed: %d!\n", __FUNCTION__, nRet);
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- KALERT("%s: Started firmware!\n", __FUNCTION__);
|
|
|
- set_current_state(TASK_INTERRUPTIBLE);
|
|
|
- schedule_timeout(_THREAD_DELAY_JIFFIES);
|
|
|
+ ksync_sleep_jiffies((long)(nCntFlashPages * KFW_DEFAULT_PAGE_ERASE_TIME));
|
|
|
+
|
|
|
+ if((nRet = TivaCmdGetBootloaderStatus(pfSpiDev, &stat)) < 0)
|
|
|
+ {
|
|
|
+ KALERT("%s: TivaCmdGetBootloaderStatus failed!\n", __FUNCTION__);
|
|
|
+ break;
|
|
|
+ }
|
|
|
|
|
|
- if(TivaCmdGetStatus(pfSpiDev, &stat) < 0)
|
|
|
+ if(stat != COMMAND_RET_SUCCESS)
|
|
|
{
|
|
|
- KALERT("%s: TivaCmdGetStatus failed!\n", __FUNCTION__);
|
|
|
+ KALERT("%s: TivaCmdGetBootloaderStatus returned 0x%02hhX!\n", __FUNCTION__, stat);
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- KALERT("%s: Status: 0x%02hhX\n", __FUNCTION__, stat);
|
|
|
+ KALERT("%s: Bootloader Status: 0x%02hhX\n", __FUNCTION__, stat);
|
|
|
+ KALERT("%s: Sending data ...\n", __FUNCTION__);
|
|
|
+ ksync_sleep_jiffies(_SLEEP_DELAY_JIFFIES);
|
|
|
+
|
|
|
+ for(i = 0; i < nCntBlocks; ++i)
|
|
|
+ {
|
|
|
+ nCbBlock = _min(KFW_DEFAULT_UPLOAD_BLOCKSIZE, nCbToSend);
|
|
|
+ if((nRet = TivaCmdSendDataBlock(pfSpiDev, pbToSend, nCbBlock)) != 0)
|
|
|
+ {
|
|
|
+ bReset = false;
|
|
|
+ KALERT("%s: TivaCmdSendDataBlock failed!\n", __FUNCTION__);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ pbToSend += nCbBlock;
|
|
|
+ nCbToSend -= nCbBlock;
|
|
|
+
|
|
|
+ if(i && !(i % 64))
|
|
|
+ {
|
|
|
+ KALERT("%s: %zu Blocks sent.\n", __FUNCTION__, i);
|
|
|
+ }
|
|
|
+
|
|
|
+// ksync_sleep_jiffies(1);
|
|
|
+
|
|
|
+ if((nRet = TivaCmdGetBootloaderStatus(pfSpiDev, &stat)) < 0)
|
|
|
+ {
|
|
|
+ bReset = false;
|
|
|
+ KALERT("%s: TivaCmdGetBootloaderStatus failed!\n", __FUNCTION__);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(stat != COMMAND_RET_SUCCESS)
|
|
|
+ {
|
|
|
+ bReset = false;
|
|
|
+ KALERT("%s: TivaCmdGetBootloaderStatus returned 0x%02hhX!\n", __FUNCTION__, stat);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
+// ksync_sleep_jiffies(1);
|
|
|
+ }
|
|
|
+
|
|
|
+ KALERT("%s: %zu Blocks sent.\n", __FUNCTION__, i);
|
|
|
+ ksync_sleep_jiffies(_SLEEP_DELAY_JIFFIES);
|
|
|
+
|
|
|
+ /////////////////////////////////////////////////////////////////
|
|
|
+
|
|
|
+ if(bReset)
|
|
|
+ {
|
|
|
+ if((nRet = TivaCmdReset(pfSpiDev)) < 0)
|
|
|
+ {
|
|
|
+ KALERT("%s: TivaCmdReset failed!\n", __FUNCTION__);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
+ KALERT("%s: Started firmware!\n", __FUNCTION__);
|
|
|
+ ksync_sleep_jiffies(_SLEEP_DELAY_JIFFIES);
|
|
|
+
|
|
|
+ if((nRet = TivaCmdGetStatus(pfSpiDev, &stat)) < 0)
|
|
|
+ {
|
|
|
+ KALERT("%s: TivaCmdGetStatus failed!\n", __FUNCTION__);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
+ KALERT("%s: FW Status: 0x%02hhX\n", __FUNCTION__, stat);
|
|
|
|
|
|
-// KALERT("%s: data: 0x%p, cb: %zu, mat: %s, bld: %s\n", __FUNCTION__, g_tui.pData, g_tui.nCbData, g_tui.pszMat, g_tui.pszBld);
|
|
|
+ bSuccess = true;
|
|
|
+ }
|
|
|
+// KALERT("%s: data: 0x%p, cb: %zu, mat: %s, bld: %s\n", __FUNCTION__, tui.pData, tui.nCbData, tui.pszMat, tui.pszBld);
|
|
|
}
|
|
|
while(0);
|
|
|
|
|
|
- SfAttLockFirmware(false);
|
|
|
kf_close(pfSpiDev);
|
|
|
+ SfAttLockFirmware(false);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
KALERT("%s: kf_open failed\n", __FUNCTION__);
|
|
|
}
|
|
|
|
|
|
- if(g_bTimerRunning)
|
|
|
+ if(!bSuccess)
|
|
|
+ {
|
|
|
+ KALERT("%s: Firmware-Upload failed! Stopping all activities!\n", __FUNCTION__);
|
|
|
+ }
|
|
|
+
|
|
|
+ _SetSysFsRunning(bSuccess);
|
|
|
+
|
|
|
+ if(_GetTimerRunning())
|
|
|
{
|
|
|
- mutex_lock(&g_mutex);
|
|
|
- mod_timer(&g_jiq_timer, _TIMER_INTERVAL);
|
|
|
- mutex_unlock(&g_mutex);
|
|
|
+ ksync_lock();
|
|
|
+ mod_timer(&g_timer_list, _TIMER_INTERVAL);
|
|
|
+ ksync_unlock();
|
|
|
}
|
|
|
+
|
|
|
+ KALERT("%s: jiffies: %lu\n", __FUNCTION__, _JIFFY_DIFF(jiffies, start));
|
|
|
}
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
@@ -278,77 +408,19 @@ static void _SysFsWorkProc(struct work_struct *work)
|
|
|
int hw, sw, ret;
|
|
|
unsigned long long nUpTime;
|
|
|
struct file *pfSpiDev = NULL;
|
|
|
- uint8_t mode = 0;
|
|
|
- uint8_t bits = 0;
|
|
|
- uint32_t speed = 0;
|
|
|
-// unsigned long start = jiffies;
|
|
|
-
|
|
|
-// KALERT("%s, Ctx: \"%s\"-(%d)\n", __FUNCTION__, current->comm, current->pid);
|
|
|
|
|
|
if((pfSpiDev = kf_open(_SPI_DEVICE, O_RDWR, 0)))
|
|
|
{
|
|
|
do
|
|
|
{
|
|
|
- if(kspi_write_mode(pfSpiDev, SPI_MODE_3) < 0)
|
|
|
- {
|
|
|
- KALERT("%s: kspi_write_mode failed!\n", __FUNCTION__);
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- if(kspi_read_mode(pfSpiDev, &mode) < 0)
|
|
|
- {
|
|
|
- KALERT("%s: kspi_read_mode failed!\n", __FUNCTION__);
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- if(mode != SPI_MODE_3)
|
|
|
- {
|
|
|
- KALERT("%s: Invalid mode!\n", __FUNCTION__);
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- /////////////////////////////////////////////////////////////////
|
|
|
-
|
|
|
- if(kspi_write_bits_per_word(pfSpiDev, _SPI_BITS_PER_WORD) < 0)
|
|
|
- {
|
|
|
- KALERT("%s: kspi_write_bits_per_word failed!\n", __FUNCTION__);
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- if(kspi_read_bits_per_word(pfSpiDev, &bits) < 0)
|
|
|
- {
|
|
|
- KALERT("%s: kspi_read_bits_per_word failed!\n", __FUNCTION__);
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- if(bits != _SPI_BITS_PER_WORD)
|
|
|
- {
|
|
|
- KALERT("%s: Invalid bits per word!\n", __FUNCTION__);
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- /////////////////////////////////////////////////////////////////
|
|
|
-
|
|
|
- if(kspi_write_max_speed_hz(pfSpiDev, _SPI_SPEED_HZ) < 0)
|
|
|
- {
|
|
|
- KALERT("%s: kspi_write_max_speed_hz failed!\n", __FUNCTION__);
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- if(kspi_read_max_speed_hz(pfSpiDev, &speed) < 0)
|
|
|
- {
|
|
|
- KALERT("%s: kspi_read_max_speed_hz failed!\n", __FUNCTION__);
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- if(speed != _SPI_SPEED_HZ)
|
|
|
+ if(!KSpiInit(pfSpiDev))
|
|
|
{
|
|
|
- KALERT("%s: Invalid max. speed!\n", __FUNCTION__);
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////
|
|
|
|
|
|
+#if !_SITARA_EGGELSBERG
|
|
|
if( (ret = TivaCmdPing(pfSpiDev)) < 0 &&
|
|
|
_IS_REVIVE_STATE(ret))
|
|
|
{
|
|
@@ -356,10 +428,10 @@ static void _SysFsWorkProc(struct work_struct *work)
|
|
|
TivaRevive(pfSpiDev);
|
|
|
}
|
|
|
|
|
|
- set_current_state(TASK_INTERRUPTIBLE);
|
|
|
- schedule_timeout(_THREAD_DELAY_JIFFIES);
|
|
|
+ ksync_sleep_jiffies(_SLEEP_DELAY_JIFFIES);
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////
|
|
|
+ // firmware
|
|
|
|
|
|
if(!g_bHasFwVersion)
|
|
|
{
|
|
@@ -367,25 +439,31 @@ static void _SysFsWorkProc(struct work_struct *work)
|
|
|
{
|
|
|
if((g_hw != hw) || (g_sw != sw))
|
|
|
{
|
|
|
+ ksync_lock();
|
|
|
g_hw = hw;
|
|
|
g_sw = sw;
|
|
|
- sysfs_notify(g_pKoTiva, NULL, "version");
|
|
|
+ ksync_unlock();
|
|
|
+ sysfs_notify(g_pKoFirmware, NULL, "version");
|
|
|
+ KALERT("%s: TivaCmdGetFirmwareVersion: HW %d, SW: %d\n", __FUNCTION__, g_hw, g_sw);
|
|
|
}
|
|
|
|
|
|
g_bHasFwVersion = true;
|
|
|
}
|
|
|
- else if(_IS_REVIVE_STATE(ret))
|
|
|
+ else
|
|
|
{
|
|
|
- KALERT("%s: TivaCmdGetFirmwareVersion failed: %d - call TivaRevive\n", __FUNCTION__, ret);
|
|
|
- TivaRevive(pfSpiDev);
|
|
|
+ if(_IS_REVIVE_STATE(ret))
|
|
|
+ {
|
|
|
+ KALERT("%s: TivaCmdGetFirmwareVersion failed: %d - call TivaRevive\n", __FUNCTION__, ret);
|
|
|
+ TivaRevive(pfSpiDev);
|
|
|
+ }
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- set_current_state(TASK_INTERRUPTIBLE);
|
|
|
- schedule_timeout(_THREAD_DELAY_JIFFIES);
|
|
|
+ ksync_sleep_jiffies(_SLEEP_DELAY_JIFFIES);
|
|
|
}
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////
|
|
|
+ // ADC
|
|
|
|
|
|
if((ret = TivaCmdGetADC(pfSpiDev, &tadc)) == 0)
|
|
|
{
|
|
@@ -393,49 +471,61 @@ static void _SysFsWorkProc(struct work_struct *work)
|
|
|
|
|
|
if(g_tadc.UVers != tadc.UVers)
|
|
|
{
|
|
|
+ ksync_lock();
|
|
|
g_tadc.UVers = tadc.UVers;
|
|
|
+ ksync_unlock();
|
|
|
bModified = true;
|
|
|
- sysfs_notify(g_pKoTiva, NULL, "UVers");
|
|
|
+ sysfs_notify(g_pKoADC, NULL, "UVers");
|
|
|
}
|
|
|
|
|
|
if(g_tadc.UBatV3 != tadc.UBatV3)
|
|
|
{
|
|
|
+ ksync_lock();
|
|
|
g_tadc.UBatV3 = tadc.UBatV3;
|
|
|
+ ksync_unlock();
|
|
|
bModified = true;
|
|
|
- sysfs_notify(g_pKoTiva, NULL, "UBatV3");
|
|
|
+ sysfs_notify(g_pKoADC, NULL, "UBatV3");
|
|
|
}
|
|
|
|
|
|
if(g_tadc.Temp != tadc.Temp)
|
|
|
{
|
|
|
+ ksync_lock();
|
|
|
g_tadc.Temp = tadc.Temp;
|
|
|
+ ksync_unlock();
|
|
|
bModified = true;
|
|
|
- sysfs_notify(g_pKoTiva, NULL, "TempBoard");
|
|
|
+ sysfs_notify(g_pKoADC, NULL, "TempBoard");
|
|
|
}
|
|
|
|
|
|
if(g_tadc.UV5Vsys != tadc.UV5Vsys)
|
|
|
{
|
|
|
+ ksync_lock();
|
|
|
g_tadc.UV5Vsys = tadc.UV5Vsys;
|
|
|
+ ksync_unlock();
|
|
|
bModified = true;
|
|
|
- sysfs_notify(g_pKoTiva, NULL, "UV5Vsys");
|
|
|
+ sysfs_notify(g_pKoADC, NULL, "UV5Vsys");
|
|
|
}
|
|
|
|
|
|
if(g_tadc.UV3V6Bat != tadc.UV3V6Bat)
|
|
|
{
|
|
|
+ ksync_lock();
|
|
|
g_tadc.UV3V6Bat = tadc.UV3V6Bat;
|
|
|
+ ksync_unlock();
|
|
|
bModified = true;
|
|
|
- sysfs_notify(g_pKoTiva, NULL, "UV3V6Bat");
|
|
|
+ sysfs_notify(g_pKoADC, NULL, "UV3V6Bat");
|
|
|
}
|
|
|
|
|
|
if(g_tadc.TempTIVA != tadc.TempTIVA)
|
|
|
{
|
|
|
+ ksync_lock();
|
|
|
g_tadc.TempTIVA = tadc.TempTIVA;
|
|
|
+ ksync_unlock();
|
|
|
bModified = true;
|
|
|
- sysfs_notify(g_pKoTiva, NULL, "TempTIVA");
|
|
|
+ sysfs_notify(g_pKoADC, NULL, "TempTIVA");
|
|
|
}
|
|
|
|
|
|
if(bModified) // if any of the ADC values have changed, signal the binary file
|
|
|
{
|
|
|
- sysfs_notify(g_pKoTiva, NULL, "AdcBin");
|
|
|
+ sysfs_notify(g_pKoADC, NULL, "AdcBin");
|
|
|
}
|
|
|
}
|
|
|
else if(_IS_REVIVE_STATE(ret))
|
|
@@ -444,8 +534,7 @@ static void _SysFsWorkProc(struct work_struct *work)
|
|
|
TivaRevive(pfSpiDev);
|
|
|
}
|
|
|
|
|
|
- set_current_state(TASK_INTERRUPTIBLE);
|
|
|
- schedule_timeout(_THREAD_DELAY_JIFFIES);
|
|
|
+ ksync_sleep_jiffies(_SLEEP_DELAY_JIFFIES);
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////
|
|
|
|
|
@@ -453,8 +542,10 @@ static void _SysFsWorkProc(struct work_struct *work)
|
|
|
{
|
|
|
if(g_nUpTime != nUpTime)
|
|
|
{
|
|
|
+ ksync_lock();
|
|
|
g_nUpTime = nUpTime;
|
|
|
- sysfs_notify(g_pKoTiva, NULL, "Uptime");
|
|
|
+ ksync_unlock();
|
|
|
+ sysfs_notify(g_pKoTiva, NULL, "uptime");
|
|
|
}
|
|
|
}
|
|
|
else if(_IS_REVIVE_STATE(ret))
|
|
@@ -463,20 +554,23 @@ static void _SysFsWorkProc(struct work_struct *work)
|
|
|
TivaRevive(pfSpiDev);
|
|
|
}
|
|
|
|
|
|
- set_current_state(TASK_INTERRUPTIBLE);
|
|
|
- schedule_timeout(_THREAD_DELAY_JIFFIES);
|
|
|
+ ksync_sleep_jiffies(_SLEEP_DELAY_JIFFIES);
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////
|
|
|
+#endif // _SITARA_EGGELSBERG
|
|
|
|
|
|
if((ret = TivaCmdGetStatus(pfSpiDev, &stat)) == 0)
|
|
|
{
|
|
|
}
|
|
|
else if(_IS_REVIVE_STATE(ret))
|
|
|
{
|
|
|
+#if !_SITARA_EGGELSBERG
|
|
|
KALERT("%s: TivaCmdGetStatus failed: %d - call TivaRevive\n", __FUNCTION__, ret);
|
|
|
TivaRevive(pfSpiDev);
|
|
|
+#endif // _SITARA_EGGELSBERG
|
|
|
}
|
|
|
|
|
|
+
|
|
|
/////////////////////////////////////////////////////////////////
|
|
|
|
|
|
// KALERT("Worker pass - jiffies: %ld - status: 0x%02hhX\n", _JIFFY_DIFF(jiffies, start), stat);
|
|
@@ -490,11 +584,11 @@ static void _SysFsWorkProc(struct work_struct *work)
|
|
|
KALERT("%s: kf_open failed\n", __FUNCTION__);
|
|
|
}
|
|
|
|
|
|
- if(g_bTimerRunning)
|
|
|
+ if(_GetTimerRunning())
|
|
|
{
|
|
|
- mutex_lock(&g_mutex);
|
|
|
- mod_timer(&g_jiq_timer, _TIMER_INTERVAL);
|
|
|
- mutex_unlock(&g_mutex);
|
|
|
+ ksync_lock();
|
|
|
+ mod_timer(&g_timer_list, _TIMER_INTERVAL);
|
|
|
+ ksync_unlock();
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -518,70 +612,109 @@ static int drv_init(void)
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
+ if(!(g_pKoBacklight = kobject_create_and_add("backlight", g_pKoTiva)))
|
|
|
+ {
|
|
|
+ KALERT("kobject_create_and_add failed\n");
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(!(g_pKoADC = kobject_create_and_add("adc", g_pKoTiva)))
|
|
|
+ {
|
|
|
+ KALERT("kobject_create_and_add failed\n");
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(!(g_pKoFirmware = kobject_create_and_add("firmware", g_pKoTiva)))
|
|
|
+ {
|
|
|
+ KALERT("kobject_create_and_add failed\n");
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
+ // generic
|
|
|
|
|
|
- if(sysfs_create_file(g_pKoTiva, &g_tivaVersionAtt.attr))
|
|
|
+ if(sysfs_create_file(g_pKoTiva, &g_tivaUptimeAtt.attr))
|
|
|
{
|
|
|
KALERT("sysfs_create_file failed\n");
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- if(sysfs_create_file(g_pKoTiva, &g_tivaUptimeAtt.attr))
|
|
|
+ /////////////////////////////////////////////////////////////////////
|
|
|
+ // firmware
|
|
|
+
|
|
|
+ if(sysfs_create_file(g_pKoFirmware, &g_tivaVersionAtt.attr))
|
|
|
{
|
|
|
KALERT("sysfs_create_file failed\n");
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- if(sysfs_create_file(g_pKoTiva, &g_tivaUVersAtt.attr))
|
|
|
+ if(SfAttInit())
|
|
|
+ {
|
|
|
+ if(sysfs_create_bin_file(g_pKoFirmware, &g_tivaFwImageAtt))
|
|
|
+ {
|
|
|
+ KALERT("sysfs_create_file failed\n");
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /////////////////////////////////////////////////////////////////////
|
|
|
+ // backlight
|
|
|
+
|
|
|
+ if(sysfs_create_file(g_pKoBacklight, &g_tivaBrightnessAtt.attr))
|
|
|
{
|
|
|
KALERT("sysfs_create_file failed\n");
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- if(sysfs_create_file(g_pKoTiva, &g_tivaUBatV3Att.attr))
|
|
|
+ if(sysfs_create_file(g_pKoBacklight, &g_tivaFrequencyAtt.attr))
|
|
|
{
|
|
|
KALERT("sysfs_create_file failed\n");
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- if(sysfs_create_file(g_pKoTiva, &g_tivaTempAtt.attr))
|
|
|
+ /////////////////////////////////////////////////////////////////////
|
|
|
+ // ADC
|
|
|
+
|
|
|
+ if(sysfs_create_file(g_pKoADC, &g_tivaUVersAtt.attr))
|
|
|
{
|
|
|
KALERT("sysfs_create_file failed\n");
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- if(sysfs_create_file(g_pKoTiva, &g_tivaUV5VsysAtt.attr))
|
|
|
+ if(sysfs_create_file(g_pKoADC, &g_tivaUBatV3Att.attr))
|
|
|
{
|
|
|
KALERT("sysfs_create_file failed\n");
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- if(sysfs_create_file(g_pKoTiva, &g_tivaUV3V6BatAtt.attr))
|
|
|
+ if(sysfs_create_file(g_pKoADC, &g_tivaTempAtt.attr))
|
|
|
{
|
|
|
KALERT("sysfs_create_file failed\n");
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- if(sysfs_create_file(g_pKoTiva, &g_tivaTempTIVAAtt.attr))
|
|
|
+ if(sysfs_create_file(g_pKoADC, &g_tivaUV5VsysAtt.attr))
|
|
|
{
|
|
|
KALERT("sysfs_create_file failed\n");
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- if(sysfs_create_bin_file(g_pKoTiva, &g_tivaAdcBinAtt))
|
|
|
+ if(sysfs_create_file(g_pKoADC, &g_tivaUV3V6BatAtt.attr))
|
|
|
{
|
|
|
KALERT("sysfs_create_file failed\n");
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- g_nCbFwData = 0;
|
|
|
- if((g_pFwBuffer = (void*)__get_free_pages(GFP_KERNEL, _FIRMWARE_PAGES_COUNT)))
|
|
|
+ if(sysfs_create_file(g_pKoADC, &g_tivaTempTIVAAtt.attr))
|
|
|
{
|
|
|
- if(sysfs_create_bin_file(g_pKoTiva, &g_tivaFirmwareAtt))
|
|
|
- {
|
|
|
- KALERT("sysfs_create_file failed\n");
|
|
|
- break;
|
|
|
- }
|
|
|
+ KALERT("sysfs_create_file failed\n");
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(sysfs_create_bin_file(g_pKoADC, &g_tivaAdcBinAtt))
|
|
|
+ {
|
|
|
+ KALERT("sysfs_create_file failed\n");
|
|
|
+ break;
|
|
|
}
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
@@ -594,15 +727,17 @@ static int drv_init(void)
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
- init_timer(&g_jiq_timer);
|
|
|
- g_jiq_timer.function = OnJigTimer;
|
|
|
- g_jiq_timer.data = 0;
|
|
|
- g_jiq_timer.expires = _TIMER_INTERVAL;
|
|
|
- add_timer(&g_jiq_timer);
|
|
|
- g_bTimerRunning = true;
|
|
|
+ init_timer(&g_timer_list);
|
|
|
+ g_timer_list.function = _WorkScheduler;
|
|
|
+ g_timer_list.data = 0;
|
|
|
+ g_timer_list.expires = _TIMER_INTERVAL;
|
|
|
+ add_timer(&g_timer_list);
|
|
|
+ _SetTimerRunning(true);
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
+ _SetSysFsRunning(true);
|
|
|
+
|
|
|
if(!queue_work(g_pwq, &g_sysFsWorkObj))
|
|
|
{
|
|
|
KALERT("%s: queue_work failed\n", __FUNCTION__);
|
|
@@ -611,17 +746,19 @@ static int drv_init(void)
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
- KALERT("%s, Ctx: \"%s\"-(%d)\n", __FUNCTION__, current->comm, current->pid);
|
|
|
+ KALERT("%s, Ctx: \"%s\"-(%d), HZ: %d\n", __FUNCTION__, current->comm, current->pid, HZ);
|
|
|
return 0;
|
|
|
}
|
|
|
while(0);
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
+
|
|
|
+ _SetSysFsRunning(false);
|
|
|
|
|
|
- if(g_bTimerRunning)
|
|
|
+ if(_GetTimerRunning())
|
|
|
{
|
|
|
- g_bTimerRunning = false;
|
|
|
- del_timer_sync(&g_jiq_timer);
|
|
|
+ _SetTimerRunning(false);
|
|
|
+ del_timer_sync(&g_timer_list);
|
|
|
}
|
|
|
|
|
|
if(g_pwq)
|
|
@@ -630,25 +767,43 @@ static int drv_init(void)
|
|
|
g_pwq = NULL;
|
|
|
}
|
|
|
|
|
|
- if(g_pFwBuffer)
|
|
|
+ SfAttExit();
|
|
|
+
|
|
|
+ if(g_pKoFirmware)
|
|
|
+ {
|
|
|
+ sysfs_remove_bin_file(g_pKoFirmware, &g_tivaFwImageAtt);
|
|
|
+ sysfs_remove_file(g_pKoFirmware, &g_tivaVersionAtt.attr);
|
|
|
+
|
|
|
+ kobject_put(g_pKoFirmware);
|
|
|
+ g_pKoFirmware = NULL;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(g_pKoADC)
|
|
|
{
|
|
|
- free_pages((unsigned long)g_pFwBuffer, _FIRMWARE_PAGES_COUNT);
|
|
|
- g_pFwBuffer = NULL;
|
|
|
- g_nCbFwData = 0;
|
|
|
+ sysfs_remove_file(g_pKoADC, &g_tivaUVersAtt.attr);
|
|
|
+ sysfs_remove_file(g_pKoADC, &g_tivaUBatV3Att.attr);
|
|
|
+ sysfs_remove_file(g_pKoADC, &g_tivaTempAtt.attr);
|
|
|
+ sysfs_remove_file(g_pKoADC, &g_tivaUV5VsysAtt.attr);
|
|
|
+ sysfs_remove_file(g_pKoADC, &g_tivaUV3V6BatAtt.attr);
|
|
|
+ sysfs_remove_file(g_pKoADC, &g_tivaTempTIVAAtt.attr);
|
|
|
+ sysfs_remove_bin_file(g_pKoADC, &g_tivaAdcBinAtt);
|
|
|
+
|
|
|
+ kobject_put(g_pKoADC);
|
|
|
+ g_pKoADC = NULL;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(g_pKoBacklight)
|
|
|
+ {
|
|
|
+ sysfs_remove_file(g_pKoBacklight, &g_tivaBrightnessAtt.attr);
|
|
|
+ sysfs_remove_file(g_pKoBacklight, &g_tivaFrequencyAtt.attr);
|
|
|
+
|
|
|
+ kobject_put(g_pKoBacklight);
|
|
|
+ g_pKoBacklight = NULL;
|
|
|
}
|
|
|
|
|
|
if(g_pKoTiva)
|
|
|
{
|
|
|
- sysfs_remove_file(g_pKoTiva, &g_tivaVersionAtt.attr);
|
|
|
sysfs_remove_file(g_pKoTiva, &g_tivaUptimeAtt.attr);
|
|
|
- sysfs_remove_file(g_pKoTiva, &g_tivaUVersAtt.attr);
|
|
|
- sysfs_remove_file(g_pKoTiva, &g_tivaUBatV3Att.attr);
|
|
|
- sysfs_remove_file(g_pKoTiva, &g_tivaTempAtt.attr);
|
|
|
- sysfs_remove_file(g_pKoTiva, &g_tivaUV5VsysAtt.attr);
|
|
|
- sysfs_remove_file(g_pKoTiva, &g_tivaUV3V6BatAtt.attr);
|
|
|
- sysfs_remove_file(g_pKoTiva, &g_tivaTempTIVAAtt.attr);
|
|
|
- sysfs_remove_bin_file(g_pKoTiva, &g_tivaAdcBinAtt);
|
|
|
- sysfs_remove_bin_file(g_pKoTiva, &g_tivaFirmwareAtt);
|
|
|
|
|
|
kobject_put(g_pKoTiva);
|
|
|
g_pKoTiva = NULL;
|
|
@@ -667,8 +822,13 @@ static int drv_init(void)
|
|
|
|
|
|
static void drv_exit(void)
|
|
|
{
|
|
|
- g_bTimerRunning = false;
|
|
|
- del_timer_sync(&g_jiq_timer);
|
|
|
+ _SetSysFsRunning(false);
|
|
|
+
|
|
|
+ if(_GetTimerRunning())
|
|
|
+ {
|
|
|
+ _SetTimerRunning(false);
|
|
|
+ del_timer_sync(&g_timer_list);
|
|
|
+ }
|
|
|
|
|
|
if(g_pwq)
|
|
|
{
|
|
@@ -676,24 +836,43 @@ static void drv_exit(void)
|
|
|
g_pwq = NULL;
|
|
|
}
|
|
|
|
|
|
- if(g_pFwBuffer)
|
|
|
+ SfAttExit();
|
|
|
+
|
|
|
+ if(g_pKoFirmware)
|
|
|
{
|
|
|
- free_pages((unsigned long)g_pFwBuffer, _FIRMWARE_PAGES_COUNT);
|
|
|
- g_pFwBuffer = NULL;
|
|
|
- g_nCbFwData = 0;
|
|
|
+ sysfs_remove_bin_file(g_pKoFirmware, &g_tivaFwImageAtt);
|
|
|
+ sysfs_remove_file(g_pKoFirmware, &g_tivaVersionAtt.attr);
|
|
|
+
|
|
|
+ kobject_put(g_pKoFirmware);
|
|
|
+ g_pKoFirmware = NULL;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(g_pKoADC)
|
|
|
+ {
|
|
|
+ sysfs_remove_file(g_pKoADC, &g_tivaUVersAtt.attr);
|
|
|
+ sysfs_remove_file(g_pKoADC, &g_tivaUBatV3Att.attr);
|
|
|
+ sysfs_remove_file(g_pKoADC, &g_tivaTempAtt.attr);
|
|
|
+ sysfs_remove_file(g_pKoADC, &g_tivaUV5VsysAtt.attr);
|
|
|
+ sysfs_remove_file(g_pKoADC, &g_tivaUV3V6BatAtt.attr);
|
|
|
+ sysfs_remove_file(g_pKoADC, &g_tivaTempTIVAAtt.attr);
|
|
|
+ sysfs_remove_bin_file(g_pKoADC, &g_tivaAdcBinAtt);
|
|
|
+
|
|
|
+ kobject_put(g_pKoADC);
|
|
|
+ g_pKoADC = NULL;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(g_pKoBacklight)
|
|
|
+ {
|
|
|
+ sysfs_remove_file(g_pKoBacklight, &g_tivaBrightnessAtt.attr);
|
|
|
+ sysfs_remove_file(g_pKoBacklight, &g_tivaFrequencyAtt.attr);
|
|
|
+
|
|
|
+ kobject_put(g_pKoBacklight);
|
|
|
+ g_pKoBacklight = NULL;
|
|
|
}
|
|
|
|
|
|
if(g_pKoTiva)
|
|
|
{
|
|
|
- sysfs_remove_file(g_pKoTiva, &g_tivaVersionAtt.attr);
|
|
|
sysfs_remove_file(g_pKoTiva, &g_tivaUptimeAtt.attr);
|
|
|
- sysfs_remove_file(g_pKoTiva, &g_tivaUVersAtt.attr);
|
|
|
- sysfs_remove_file(g_pKoTiva, &g_tivaUBatV3Att.attr);
|
|
|
- sysfs_remove_file(g_pKoTiva, &g_tivaTempAtt.attr);
|
|
|
- sysfs_remove_file(g_pKoTiva, &g_tivaUV5VsysAtt.attr);
|
|
|
- sysfs_remove_file(g_pKoTiva, &g_tivaUV3V6BatAtt.attr);
|
|
|
- sysfs_remove_file(g_pKoTiva, &g_tivaTempTIVAAtt.attr);
|
|
|
- sysfs_remove_bin_file(g_pKoTiva, &g_tivaFirmwareAtt);
|
|
|
|
|
|
kobject_put(g_pKoTiva);
|
|
|
}
|