Mercurial > pt1.oyama
diff driver/pt1_pci.c @ 86:015481a6a900
clean up a bit.
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Tue, 19 Jan 2010 06:33:08 +0900 |
| parents | cfb2da5ee428 |
| children | c6311b6efd9c |
line wrap: on
line diff
--- a/driver/pt1_pci.c Tue Jan 19 06:13:40 2010 +0900 +++ b/driver/pt1_pci.c Tue Jan 19 06:33:08 2010 +0900 @@ -137,7 +137,7 @@ // I2Cアドレス(video0, 1 = ISDB-S) (video2, 3 = ISDB-T) int i2c_address[MAX_CHANNEL] = {T0_ISDB_S, T1_ISDB_S, T0_ISDB_T, T1_ISDB_T}; -int real_chanel[MAX_CHANNEL] = {0, 2, 1, 3}; +int real_channel[MAX_CHANNEL] = {0, 2, 1, 3}; int channeltype[MAX_CHANNEL] = {CHANNEL_TYPE_ISDB_S, CHANNEL_TYPE_ISDB_S, CHANNEL_TYPE_ISDB_T, CHANNEL_TYPE_ISDB_T}; @@ -223,7 +223,7 @@ printk(KERN_ERR "DMA Channel Number Error(%d)\n", dma_channel); continue ; } - chno = real_chanel[(((micro.packet.head >> 5) & 0x07) - 1)]; + chno = real_channel[(((micro.packet.head >> 5) & 0x07) - 1)]; packet_pos = ((micro.packet.head >> 2) & 0x07); channel = dev_conf->channel[chno] ; // エラーチェック @@ -311,7 +311,7 @@ // 頻度を落す(4Kで起動させる) for(lp = 0 ; lp < MAX_CHANNEL ; lp++){ - channel = dev_conf->channel[real_chanel[lp]] ; + channel = dev_conf->channel[real_channel[lp]] ; if((channel->size >= DMA_SIZE) && (channel->valid == TRUE)){ wake_up(&channel->wait_q); } @@ -507,14 +507,11 @@ case GET_SIGNAL_STRENGTH: switch(channel->type){ case CHANNEL_TYPE_ISDB_S: - { - signal = isdb_s_read_signal_strength(channel->ptr->regs, - &channel->ptr->lock, - channel->address); - } + signal = isdb_s_read_signal_strength(channel->ptr->regs, + &channel->ptr->lock, + channel->address); break ; case CHANNEL_TYPE_ISDB_T: - // calc C/N signal = isdb_t_read_signal_strength(channel->ptr->regs, &channel->ptr->lock, channel->address); break ; @@ -774,7 +771,7 @@ channel->address = i2c_address[lp] ; channel->type = channeltype[lp] ; // 実際のチューナ番号 - channel->channel = real_chanel[lp] ; + channel->channel = real_channel[lp] ; channel->ptr = dev_conf ; channel->size = 0 ; dev_conf->channel[lp] = channel ;