armbian/linux
0
0
Fork 0
mirror of https://github.com/armbian/linux.git synced 2026-01-06 10:13:00 -08:00
Code Issues Packages Projects Releases Wiki Activity

fix cmmb compile error

Browse Source
This commit is contained in:
root
2010-09-19 16:07:07 +08:00
parent 1d69262602
commit 265a86d5e3
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/cmmb/siano/smscoreapi.c
View File

@@ -36,7 +36,7 @@
#include "smscoreapi.h"
#include "smsendian.h"
#include "sms-cards.h"
#include <mach/gpio.h>
#define MAX_GPIO_PIN_NUMBER 31

2
drivers/cmmb/siano/smscoreapi.h
View File

@@ -542,7 +542,7 @@ extern int sms_debug;
#define sms_info(fmt, arg...) \
dprintk(KERN_INFO, DBG_INFO, fmt, ##arg)
#define sms_debug(fmt, arg...) \
dprintk(KERN_INFO, DBG_INFO, fmt, ##arg)//
dprintk(KERN_INFO, DBG_INFO, fmt, ##arg)
//define the gpio used
#define CMMB_1186_SPIIRQ RK2818_PIN_PA6 //This Pin is SDK Board GPIOPortA_Pin6

14
drivers/cmmb/siano/smsspilog.c
View File

@@ -106,8 +106,8 @@ static int spi_suspended = 0 ;
static void spi_worker_thread(void *arg);
#if SIANO_HALFDUPLEX
int g_IsTokenOwned=FALSE;
int g_IsTokenEnable=FALSE;
int g_IsTokenOwned=false;
int g_IsTokenEnable=false;
struct semaphore HalfDuplexSemaphore;
struct task_struct *SPI_Thread;
static int SPI_Thread_IsStop=0;
@@ -152,8 +152,8 @@ static void spi_worker_thread(void *arg)
#if SIANO_HALFDUPLEX
static UINT8 s_SpiTokenMsgBuf[256] = {0};
const UINT8 g_PreambleBytes[4] = { 0xa5, 0x5a, 0xe7, 0x7e};
static u8 s_SpiTokenMsgBuf[256] = {0};
const u8 g_PreambleBytes[4] = { 0xa5, 0x5a, 0xe7, 0x7e};
struct SmsMsgHdr_ST s_SpiTokenSendMsg = {MSG_SMS_SPI_HALFDUPLEX_TOKEN_HOST_TO_DEVICE, 0, 11, sizeof(struct SmsMsgHdr_ST), MSG_HDR_FLAG_STATIC_MSG};
memcpy( s_SpiTokenMsgBuf, g_PreambleBytes, sizeof(g_PreambleBytes) );
@@ -171,7 +171,7 @@ static void spi_worker_thread(void *arg)
if (!msg) {
// TX queue empty - give up token
sms_debug("TX queue empty - give up token\n");
g_IsTokenOwned = FALSE;
g_IsTokenOwned = false;
txmsg.len = 256;
txmsg.buf = s_SpiTokenMsgBuf;
txmsg.buf_phy_addr = 0;//zzf spi_device->txbuf_phy_addr;
@@ -728,7 +728,7 @@ static int siano1186_probe( struct spi_device *Smsdevice)
}
#if SIANO_HALFDUPLEX
g_IsTokenOwned = FALSE;
g_IsTokenOwned = false;
init_MUTEX_LOCKED(&HalfDuplexSemaphore);
SPI_Thread = kthread_run(spi_worker_thread,NULL,"cmmb_spi_thread");
SPI_Thread_IsStop = 0;
@@ -782,7 +782,7 @@ void smsspi_remove(void)
{
struct _spi_device_st *spi_device = spi_dev;
sms_info(KERN_INFO "smsmdtv: in smsspi_unregister\n") ;
int ret;
#if SIANO_HALFDUPLEX
SPI_Thread_IsStop = 1;
up(&HalfDuplexSemaphore);

2
drivers/cmmb/siano/smsspiphy_rk.c
View File

@@ -180,11 +180,13 @@ static unsigned long dma_map_buf(struct spiphy_dev_s *spiphy_dev, char *buf,
return 0;
}
/* map buffer */
/*
phyaddr = dma_map_single(spiphy_dev->dev, buf, len, direction);
if (dma_mapping_error(phyaddr)) {
PERROR("exiting with error\n");
return 0;
}
*/
return phyaddr;
}