Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 235987
b: refs/heads/master
c: decebab
h: refs/heads/master
i:
  235985: f87c7a8
  235983: 0bbabd5
v: v3
  • Loading branch information
Krzysztof Hałasa authored and Greg Kroah-Hartman committed Feb 18, 2011
1 parent 01b00e8 commit c2763a3
Show file tree
Hide file tree
Showing 17 changed files with 267 additions and 272 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ae69b22c6ca7d1d7fdccf0b664dafbc777099abe
refs/heads/master: decebabf24ca179749dcac8a3fb87f7186bdf898
60 changes: 30 additions & 30 deletions trunk/drivers/staging/solo6x10/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,27 +25,27 @@
#include "solo6x10.h"
#include "tw28.h"

MODULE_DESCRIPTION("Softlogic 6010 MP4 Encoder/Decoder V4L2/ALSA Driver");
MODULE_DESCRIPTION("Softlogic 6x10 MP4/H.264 Encoder/Decoder V4L2/ALSA Driver");
MODULE_AUTHOR("Ben Collins <bcollins@bluecherry.net>");
MODULE_VERSION(SOLO6010_VERSION);
MODULE_VERSION(SOLO6X10_VERSION);
MODULE_LICENSE("GPL");

void solo6010_irq_on(struct solo6010_dev *solo_dev, u32 mask)
void solo_irq_on(struct solo_dev *solo_dev, u32 mask)
{
solo_dev->irq_mask |= mask;
solo_reg_write(solo_dev, SOLO_IRQ_ENABLE, solo_dev->irq_mask);
}

void solo6010_irq_off(struct solo6010_dev *solo_dev, u32 mask)
void solo_irq_off(struct solo_dev *solo_dev, u32 mask)
{
solo_dev->irq_mask &= ~mask;
solo_reg_write(solo_dev, SOLO_IRQ_ENABLE, solo_dev->irq_mask);
}

/* XXX We should check the return value of the sub-device ISR's */
static irqreturn_t solo6010_isr(int irq, void *data)
static irqreturn_t solo_isr(int irq, void *data)
{
struct solo6010_dev *solo_dev = data;
struct solo_dev *solo_dev = data;
u32 status;
int i;

Expand Down Expand Up @@ -88,7 +88,7 @@ static irqreturn_t solo6010_isr(int irq, void *data)
return IRQ_HANDLED;
}

static void free_solo_dev(struct solo6010_dev *solo_dev)
static void free_solo_dev(struct solo_dev *solo_dev)
{
struct pci_dev *pdev;

Expand Down Expand Up @@ -116,7 +116,7 @@ static void free_solo_dev(struct solo6010_dev *solo_dev)

/* Now cleanup the PCI device */
if (solo_dev->reg_base) {
solo6010_irq_off(solo_dev, ~0);
solo_irq_off(solo_dev, ~0);
pci_iounmap(pdev, solo_dev->reg_base);
free_irq(pdev->irq, solo_dev);
}
Expand All @@ -128,10 +128,10 @@ static void free_solo_dev(struct solo6010_dev *solo_dev)
kfree(solo_dev);
}

static int __devinit solo6010_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *id)
static int __devinit solo_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *id)
{
struct solo6010_dev *solo_dev;
struct solo_dev *solo_dev;
int ret;
int sdram;
u8 chip_id;
Expand All @@ -151,7 +151,7 @@ static int __devinit solo6010_pci_probe(struct pci_dev *pdev,

pci_set_master(pdev);

ret = pci_request_regions(pdev, SOLO6010_NAME);
ret = pci_request_regions(pdev, SOLO6X10_NAME);
if (ret)
goto fail_probe;

Expand Down Expand Up @@ -184,7 +184,7 @@ static int __devinit solo6010_pci_probe(struct pci_dev *pdev,
solo_dev->flags = id->driver_data;

/* Disable all interrupts to start */
solo6010_irq_off(solo_dev, ~0);
solo_irq_off(solo_dev, ~0);

reg = SOLO_SYS_CFG_SDRAM64BIT;
/* Initial global settings */
Expand Down Expand Up @@ -223,13 +223,13 @@ static int __devinit solo6010_pci_probe(struct pci_dev *pdev,
/* PLL locking time of 1ms */
mdelay(1);

ret = request_irq(pdev->irq, solo6010_isr, IRQF_SHARED, SOLO6010_NAME,
ret = request_irq(pdev->irq, solo_isr, IRQF_SHARED, SOLO6X10_NAME,
solo_dev);
if (ret)
goto fail_probe;

/* Handle this from the start */
solo6010_irq_on(solo_dev, SOLO_IRQ_PCI_ERR);
solo_irq_on(solo_dev, SOLO_IRQ_PCI_ERR);

ret = solo_i2c_init(solo_dev);
if (ret)
Expand Down Expand Up @@ -283,14 +283,14 @@ static int __devinit solo6010_pci_probe(struct pci_dev *pdev,
return ret;
}

static void __devexit solo6010_pci_remove(struct pci_dev *pdev)
static void __devexit solo_pci_remove(struct pci_dev *pdev)
{
struct solo6010_dev *solo_dev = pci_get_drvdata(pdev);
struct solo_dev *solo_dev = pci_get_drvdata(pdev);

free_solo_dev(solo_dev);
}

static struct pci_device_id solo6010_id_table[] = {
static struct pci_device_id solo_id_table[] = {
/* 6010 based cards */
{PCI_DEVICE(PCI_VENDOR_ID_SOFTLOGIC, PCI_DEVICE_ID_SOLO6010)},
{PCI_DEVICE(PCI_VENDOR_ID_SOFTLOGIC, PCI_DEVICE_ID_SOLO6110),
Expand All @@ -308,24 +308,24 @@ static struct pci_device_id solo6010_id_table[] = {
{0,}
};

MODULE_DEVICE_TABLE(pci, solo6010_id_table);
MODULE_DEVICE_TABLE(pci, solo_id_table);

static struct pci_driver solo6010_pci_driver = {
.name = SOLO6010_NAME,
.id_table = solo6010_id_table,
.probe = solo6010_pci_probe,
.remove = solo6010_pci_remove,
static struct pci_driver solo_pci_driver = {
.name = SOLO6X10_NAME,
.id_table = solo_id_table,
.probe = solo_pci_probe,
.remove = solo_pci_remove,
};

static int __init solo6010_module_init(void)
static int __init solo_module_init(void)
{
return pci_register_driver(&solo6010_pci_driver);
return pci_register_driver(&solo_pci_driver);
}

static void __exit solo6010_module_exit(void)
static void __exit solo_module_exit(void)
{
pci_unregister_driver(&solo6010_pci_driver);
pci_unregister_driver(&solo_pci_driver);
}

module_init(solo6010_module_init);
module_exit(solo6010_module_exit);
module_init(solo_module_init);
module_exit(solo_module_exit);
16 changes: 8 additions & 8 deletions trunk/drivers/staging/solo6x10/disp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static unsigned video_type;
module_param(video_type, uint, 0644);
MODULE_PARM_DESC(video_type, "video_type (0 = NTSC/Default, 1 = PAL)");

static void solo_vin_config(struct solo6010_dev *solo_dev)
static void solo_vin_config(struct solo_dev *solo_dev)
{
solo_dev->vin_hstart = 8;
solo_dev->vin_vstart = 2;
Expand Down Expand Up @@ -97,7 +97,7 @@ static void solo_vin_config(struct solo6010_dev *solo_dev)
SOLO_VI_PB_HSTOP(16 + 720));
}

static void solo_disp_config(struct solo6010_dev *solo_dev)
static void solo_disp_config(struct solo_dev *solo_dev)
{
solo_dev->vout_hstart = 6;
solo_dev->vout_vstart = 8;
Expand Down Expand Up @@ -145,7 +145,7 @@ static void solo_disp_config(struct solo6010_dev *solo_dev)
solo_reg_write(solo_dev, SOLO_WATCHDOG, 0);
}

static int solo_dma_vin_region(struct solo6010_dev *solo_dev, u32 off,
static int solo_dma_vin_region(struct solo_dev *solo_dev, u32 off,
u16 val, int reg_size)
{
u16 buf[64];
Expand All @@ -163,7 +163,7 @@ static int solo_dma_vin_region(struct solo6010_dev *solo_dev, u32 off,
return ret;
}

void solo_set_motion_threshold(struct solo6010_dev *solo_dev, u8 ch, u16 val)
void solo_set_motion_threshold(struct solo_dev *solo_dev, u8 ch, u16 val)
{
if (ch > solo_dev->nr_chans)
return;
Expand All @@ -177,7 +177,7 @@ void solo_set_motion_threshold(struct solo6010_dev *solo_dev, u8 ch, u16 val)
* threshold and working table for each channel. Atleast that's what the
* spec says. However, this code (take from rdk) has some mystery 8k
* block right after the flag area, before the first thresh table. */
static void solo_motion_config(struct solo6010_dev *solo_dev)
static void solo_motion_config(struct solo_dev *solo_dev)
{
int i;

Expand Down Expand Up @@ -209,7 +209,7 @@ static void solo_motion_config(struct solo6010_dev *solo_dev)
solo_reg_write(solo_dev, SOLO_VI_MOTION_BAR, 0);
}

int solo_disp_init(struct solo6010_dev *solo_dev)
int solo_disp_init(struct solo_dev *solo_dev)
{
int i;

Expand All @@ -234,11 +234,11 @@ int solo_disp_init(struct solo6010_dev *solo_dev)
return 0;
}

void solo_disp_exit(struct solo6010_dev *solo_dev)
void solo_disp_exit(struct solo_dev *solo_dev)
{
int i;

solo6010_irq_off(solo_dev, SOLO_IRQ_MOTION);
solo_irq_off(solo_dev, SOLO_IRQ_MOTION);

solo_reg_write(solo_dev, SOLO_VO_DISP_CTRL, 0);
solo_reg_write(solo_dev, SOLO_VO_ZOOM_CTRL, 0);
Expand Down
16 changes: 8 additions & 8 deletions trunk/drivers/staging/solo6x10/enc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#define VI_PROG_HSIZE (1280 - 16)
#define VI_PROG_VSIZE (1024 - 16)

static void solo_capture_config(struct solo6010_dev *solo_dev)
static void solo_capture_config(struct solo_dev *solo_dev)
{
int i, j;
unsigned long height;
Expand Down Expand Up @@ -115,7 +115,7 @@ static void solo_capture_config(struct solo6010_dev *solo_dev)

int solo_osd_print(struct solo_enc_dev *solo_enc)
{
struct solo6010_dev *solo_dev = solo_enc->solo_dev;
struct solo_dev *solo_dev = solo_enc->solo_dev;
char *str = solo_enc->osd_text;
u8 *buf;
u32 reg = solo_reg_read(solo_dev, SOLO_VE_OSD_CH);
Expand Down Expand Up @@ -151,7 +151,7 @@ int solo_osd_print(struct solo_enc_dev *solo_enc)
return 0;
}

static void solo_jpeg_config(struct solo6010_dev *solo_dev)
static void solo_jpeg_config(struct solo_dev *solo_dev)
{
u32 reg;
if (solo_dev->flags & FLAGS_6110)
Expand All @@ -169,7 +169,7 @@ static void solo_jpeg_config(struct solo6010_dev *solo_dev)
solo_reg_write(solo_dev, 0x0688, (0 << 16) | (30 << 8) | 60);
}

static void solo_mp4e_config(struct solo6010_dev *solo_dev)
static void solo_mp4e_config(struct solo_dev *solo_dev)
{
int i;
u32 reg;
Expand Down Expand Up @@ -206,7 +206,7 @@ static void solo_mp4e_config(struct solo6010_dev *solo_dev)
solo_reg_write(solo_dev, 0x0634, 0x00040008); /* ? */
}

int solo_enc_init(struct solo6010_dev *solo_dev)
int solo_enc_init(struct solo_dev *solo_dev)
{
int i;

Expand All @@ -219,16 +219,16 @@ int solo_enc_init(struct solo6010_dev *solo_dev)
solo_reg_write(solo_dev, SOLO_CAP_CH_COMP_ENA_E(i), 0);
}

solo6010_irq_on(solo_dev, SOLO_IRQ_ENCODER);
solo_irq_on(solo_dev, SOLO_IRQ_ENCODER);

return 0;
}

void solo_enc_exit(struct solo6010_dev *solo_dev)
void solo_enc_exit(struct solo_dev *solo_dev)
{
int i;

solo6010_irq_off(solo_dev, SOLO_IRQ_ENCODER);
solo_irq_off(solo_dev, SOLO_IRQ_ENCODER);

for (i = 0; i < solo_dev->nr_chans; i++) {
solo_reg_write(solo_dev, SOLO_CAP_CH_SCALE(i), 0);
Expand Down
Loading

0 comments on commit c2763a3

Please sign in to comment.