Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-elphel
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
linux-elphel
Commits
a89358c3
Commit
a89358c3
authored
Apr 21, 2016
by
Mikhail Karpenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove printk from tasklet, fix code to work with interframe_pars_t
parent
403a0e08
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
16 deletions
+12
-16
circbuf.c
src/drivers/elphel/circbuf.c
+12
-13
sensor_common.c
src/drivers/elphel/sensor_common.c
+0
-3
No files found.
src/drivers/elphel/circbuf.c
View file @
a89358c3
...
@@ -271,7 +271,7 @@ int circbuf_open(struct inode *inode, struct file *filp)
...
@@ -271,7 +271,7 @@ int circbuf_open(struct inode *inode, struct file *filp)
void
dump_interframe_params
(
struct
interframe_params_t
*
params
,
int
offset
)
void
dump_interframe_params
(
struct
interframe_params_t
*
params
,
int
offset
)
{
{
dev_dbg
(
g_dev_ptr
,
"Dump of interframe parameters at offset 0x%x:
\n
"
,
offset
);
dev_dbg
(
g_dev_ptr
,
"Dump of interframe parameters at offset 0x%x:
\n
"
,
offset
);
print_hex_dump_bytes
(
""
,
DUMP_PREFIX_OFFSET
,
params
,
sizeof
(
struct
interframe_params_t
));
print_hex_dump_bytes
(
""
,
DUMP_PREFIX_OFFSET
,
params
,
sizeof
(
struct
interframe_params_t
)
-
4
);
}
}
/**
/**
...
@@ -318,10 +318,10 @@ int circbuf_valid_ptr(int rp, struct interframe_params_t **fpp, unsigned int chn
...
@@ -318,10 +318,10 @@ int circbuf_valid_ptr(int rp, struct interframe_params_t **fpp, unsigned int chn
dev_dbg
(
g_dev_ptr
,
"misaligned pointer rp = 0x%x for channel %d
\n
"
,
rp
,
chn
);
dev_dbg
(
g_dev_ptr
,
"misaligned pointer rp = 0x%x for channel %d
\n
"
,
rp
,
chn
);
return
-
2
;
return
-
2
;
}
}
fp
=
(
struct
interframe_params_t
*
)
&
circbuf_priv
[
chn
].
buf_ptr
[
BYTE2DW
(
X393_BUFFSUB
(
rp
,
sizeof
(
struct
interframe_params_t
)))];
fp
=
(
struct
interframe_params_t
*
)
&
circbuf_priv
[
chn
].
buf_ptr
[
BYTE2DW
(
X393_BUFFSUB
(
rp
,
sizeof
(
struct
interframe_params_t
)
-
4
))];
*
fpp
=
fp
;
*
fpp
=
fp
;
dump_interframe_params
(
fp
,
X393_BUFFSUB
(
rp
,
sizeof
(
struct
interframe_params_t
)));
dump_interframe_params
(
fp
,
X393_BUFFSUB
(
rp
,
sizeof
(
struct
interframe_params_t
)
-
4
));
if
(
BYTE2DW
(
rp
)
==
wp
)
if
(
BYTE2DW
(
rp
)
==
wp
)
// read pointer and write pointer coincide, frame not yet acquired
// read pointer and write pointer coincide, frame not yet acquired
...
@@ -724,16 +724,6 @@ static int circbuf_all_init(struct platform_device *pdev)
...
@@ -724,16 +724,6 @@ static int circbuf_all_init(struct platform_device *pdev)
}
}
dev_info
(
dev
,
"registered MAJOR: %d
\n
"
,
CIRCBUF_MAJOR
);
dev_info
(
dev
,
"registered MAJOR: %d
\n
"
,
CIRCBUF_MAJOR
);
res
=
init_ccam_dma_buf_ptr
(
pdev
);
if
(
res
<
0
)
{
dev_err
(
dev
,
"ERROR allocating coherent DMA buffer
\n
"
);
return
-
ENOMEM
;
}
dev_dbg
(
dev
,
"initialize circbuf wait queue
\n
"
);
init_waitqueue_head
(
&
circbuf_wait_queue
);
dev_dbg
(
dev
,
"initialize Huffman tables with default data
\n
"
);
res
=
jpeghead_init
(
pdev
);
res
=
jpeghead_init
(
pdev
);
if
(
res
<
0
)
{
if
(
res
<
0
)
{
dev_err
(
dev
,
"unable to initialize jpeghead module
\n
"
);
dev_err
(
dev
,
"unable to initialize jpeghead module
\n
"
);
...
@@ -744,6 +734,15 @@ static int circbuf_all_init(struct platform_device *pdev)
...
@@ -744,6 +734,15 @@ static int circbuf_all_init(struct platform_device *pdev)
dev_err
(
dev
,
"unable to initialize sensor_common module
\n
"
);
dev_err
(
dev
,
"unable to initialize sensor_common module
\n
"
);
return
res
;
return
res
;
}
}
res
=
init_ccam_dma_buf_ptr
(
pdev
);
if
(
res
<
0
)
{
dev_err
(
dev
,
"ERROR allocating coherent DMA buffer
\n
"
);
return
-
ENOMEM
;
}
dev_dbg
(
dev
,
"initialize circbuf wait queue
\n
"
);
init_waitqueue_head
(
&
circbuf_wait_queue
);
dev_dbg
(
dev
,
"initialize Huffman tables with default data
\n
"
);
g_dev_ptr
=
dev
;
g_dev_ptr
=
dev
;
...
...
src/drivers/elphel/sensor_common.c
View file @
a89358c3
...
@@ -523,9 +523,6 @@ void tasklet_fpga_function(unsigned long arg) {
...
@@ -523,9 +523,6 @@ void tasklet_fpga_function(unsigned long arg) {
int
i
,
j
;
int
i
,
j
;
int
last_image_chunk
;
int
last_image_chunk
;
int
len32
;
int
len32
;
int
circbuf_size
=
get_globalParam
(
G_CIRCBUFSIZE
);
unsigned
long
*
buf_ptr
;
printk
(
KERN_DEBUG
"%s: get_globalParam(G_CIRCBUFSIZE) = %d
\n
"
,
__func__
,
circbuf_size
);
#ifdef TEST_DISABLE_CODE
#ifdef TEST_DISABLE_CODE
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment