Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FMC DIO 5ch TTL a
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
6
Issues
6
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
FMC DIO 5ch TTL a
Commits
8468c898
Commit
8468c898
authored
Oct 05, 2020
by
Jorge Machado
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix 8ns glitch
parent
708189b9
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
17 deletions
+42
-17
fmc-dio-internal.c
sw/kernel/fmc-dio-internal.c
+40
-15
wr-dio-cmd.c
sw/tools/wr-dio-cmd.c
+2
-2
No files found.
sw/kernel/fmc-dio-internal.c
View file @
8468c898
...
@@ -24,6 +24,8 @@
...
@@ -24,6 +24,8 @@
#include <linux/fmc.h>
#include <linux/fmc.h>
#include <linux/fmc-sdb.h>
#include <linux/fmc-sdb.h>
#include <linux/delay.h>
#include "fmc-dio.h"
#include "fmc-dio.h"
#ifdef DIO_STAT
#ifdef DIO_STAT
...
@@ -105,6 +107,7 @@ static int fmc_dio_int_cmd_pulse(struct fmc_dio *dev,
...
@@ -105,6 +107,7 @@ static int fmc_dio_int_cmd_pulse(struct fmc_dio *dev,
uint32_t
reg
;
uint32_t
reg
;
int
ch
;
int
ch
;
struct
regmap_common
dio
;
struct
regmap_common
dio
;
uint32_t
pulse_per_loaded
;
dio
=
get_regmap_common
(
dev
->
version
);
dio
=
get_regmap_common
(
dev
->
version
);
...
@@ -123,17 +126,27 @@ static int fmc_dio_int_cmd_pulse(struct fmc_dio *dev,
...
@@ -123,17 +126,27 @@ static int fmc_dio_int_cmd_pulse(struct fmc_dio *dev,
writel
(
reg
|
(
1
<<
4
*
ch
),
base
+
dio
.
iomode_reg
);
writel
(
reg
|
(
1
<<
4
*
ch
),
base
+
dio
.
iomode_reg
);
/* Clear width and period registers */
/* Clear width and period registers */
pulse_per_loaded
=
readl
(
base
+
map
->
pulse_per
);
writel
(
0
,
base
+
map
->
pulse_per
);
writel
(
0
,
base
+
map
->
pulse_per
);
writel
(
1
,
base
+
map
->
pulse
);
//Set to 1 to avoid 3 second pulse due to compensation into gw
writel
(
1
,
base
+
map
->
pulse
);
//Set to 1 to avoid 3 second pulse due to compensation into gw
writel
(
1
<<
ch
,
base
+
dio
.
latch_reg
);
writel
(
1
<<
ch
,
base
+
dio
.
latch_reg
);
writel
(
1
<<
ch
,
base
+
dio
.
pulse_reg
);
atomic_set
(
&
c
->
count
,
0
);
atomic_set
(
&
c
->
count
,
0
);
writel
(
ts
[
1
].
tv_nsec
/
8
,
base
+
map
->
pulse
);
/* width */
if
(
cmd
->
flags
&
WR_DIO_F_REL
)
{
pulse_per_loaded
*=
8
;
msleep
(
pulse_per_loaded
/
1000000
);
}
if
(
cmd
->
value
==
0
)
if
(
cmd
->
value
==
0
&&
cmd
->
flags
&
WR_DIO_F_LOOP
)
return
0
;
return
0
;
writel
(
ts
[
1
].
tv_nsec
/
8
,
base
+
map
->
pulse
);
/* width */
//if(cmd->value == 0)
// return 0;
if
(
cmd
->
flags
&
WR_DIO_F_NOW
)
{
if
(
cmd
->
flags
&
WR_DIO_F_NOW
)
{
/* Generate a pulse train from current time in V2 DIO version*/
/* Generate a pulse train from current time in V2 DIO version*/
...
@@ -141,9 +154,9 @@ static int fmc_dio_int_cmd_pulse(struct fmc_dio *dev,
...
@@ -141,9 +154,9 @@ static int fmc_dio_int_cmd_pulse(struct fmc_dio *dev,
if
(
cmd
->
flags
&
WR_DIO_F_LOOP
&&
cmd
->
value
!=
1
)
{
if
(
cmd
->
flags
&
WR_DIO_F_LOOP
&&
cmd
->
value
!=
1
)
{
writel
(
ts
[
2
].
tv_nsec
/
8
,
base
+
map
->
pulse_per
);
writel
(
ts
[
2
].
tv_nsec
/
8
,
base
+
map
->
pulse_per
);
c
->
target_channel
=
ch
;
c
->
target_channel
=
ch
;
if
(
cmd
->
value
>
1
)
{
cmd
->
value
-=
2
;
cmd
->
value
-=
2
;
}
atomic_set
(
&
c
->
count
,
cmd
->
value
);
atomic_set
(
&
c
->
count
,
cmd
->
value
);
}
}
}
}
...
@@ -176,9 +189,7 @@ static int fmc_dio_int_cmd_pulse(struct fmc_dio *dev,
...
@@ -176,9 +189,7 @@ static int fmc_dio_int_cmd_pulse(struct fmc_dio *dev,
}
}
else
{
else
{
writel
(
ts
[
2
].
tv_nsec
/
8
,
base
+
map
->
pulse_per
);
writel
(
ts
[
2
].
tv_nsec
/
8
,
base
+
map
->
pulse_per
);
if
(
cmd
->
value
>
1
)
{
cmd
->
value
-=
2
;
cmd
->
value
-=
1
;
}
}
}
atomic_set
(
&
c
->
count
,
cmd
->
value
);
atomic_set
(
&
c
->
count
,
cmd
->
value
);
...
@@ -402,6 +413,7 @@ static int fmc_dio_int_cmd_irq(struct fmc_dio *dev,
...
@@ -402,6 +413,7 @@ static int fmc_dio_int_cmd_irq(struct fmc_dio *dev,
uint32_t
reg
;
uint32_t
reg
;
int
ch
;
int
ch
;
struct
regmap_common
dio
;
struct
regmap_common
dio
;
uint32_t
pulse_per_loaded
;
if
(
dev
->
version
!=
1
)
if
(
dev
->
version
!=
1
)
return
-
ENOTSUPP
;
return
-
ENOTSUPP
;
...
@@ -419,6 +431,21 @@ static int fmc_dio_int_cmd_irq(struct fmc_dio *dev,
...
@@ -419,6 +431,21 @@ static int fmc_dio_int_cmd_irq(struct fmc_dio *dev,
ts
=
cmd
->
t
;
ts
=
cmd
->
t
;
pulse_per_loaded
=
readl
(
base
+
map
->
pulse_per
);
writel
(
0
,
base
+
map
->
pulse_per
);
writel
(
1
,
base
+
map
->
pulse
);
//Set to 1 to avoid 3 second pulse due to compensation into gw
writel
(
1
<<
ch
,
base
+
dio
.
latch_reg
);
atomic_set
(
&
c
->
count
,
0
);
if
(
cmd
->
flags
&
WR_DIO_F_REL
)
{
pulse_per_loaded
*=
8
;
msleep
(
pulse_per_loaded
/
1000000
);
}
if
(
cmd
->
value
==
0
&&
cmd
->
flags
&
WR_DIO_F_LOOP
)
return
0
;
/* First, configure the IRQ channel */
/* First, configure the IRQ channel */
reg
=
readl
(
base
+
dio
.
iomode_reg
);
reg
=
readl
(
base
+
dio
.
iomode_reg
);
writel
((
reg
|
CHANNEL_5_IRQ_EN_MASK
),
base
+
dio
.
iomode_reg
);
writel
((
reg
|
CHANNEL_5_IRQ_EN_MASK
),
base
+
dio
.
iomode_reg
);
...
@@ -429,9 +456,9 @@ static int fmc_dio_int_cmd_irq(struct fmc_dio *dev,
...
@@ -429,9 +456,9 @@ static int fmc_dio_int_cmd_irq(struct fmc_dio *dev,
if
(
cmd
->
flags
&
WR_DIO_F_LOOP
&&
cmd
->
value
!=
1
)
{
if
(
cmd
->
flags
&
WR_DIO_F_LOOP
&&
cmd
->
value
!=
1
)
{
writel
(
ts
[
1
].
tv_nsec
/
8
,
base
+
map
->
pulse_per
);
writel
(
ts
[
1
].
tv_nsec
/
8
,
base
+
map
->
pulse_per
);
c
->
target_channel
=
ch
;
c
->
target_channel
=
ch
;
if
(
cmd
->
value
>
1
)
{
cmd
->
value
-=
2
;
cmd
->
value
-=
2
;
}
atomic_set
(
&
c
->
count
,
cmd
->
value
);
atomic_set
(
&
c
->
count
,
cmd
->
value
);
}
}
writel
(
1
<<
ch
,
base
+
dio
.
pulse_reg
);
writel
(
1
<<
ch
,
base
+
dio
.
pulse_reg
);
...
@@ -456,9 +483,7 @@ static int fmc_dio_int_cmd_irq(struct fmc_dio *dev,
...
@@ -456,9 +483,7 @@ static int fmc_dio_int_cmd_irq(struct fmc_dio *dev,
/* Configure period */
/* Configure period */
writel
(
(
ts
[
1
].
tv_nsec
/
8
)
+
(
ts
[
1
].
tv_sec
*
1000000000
/
8
),
base
+
map
->
pulse_per
);
writel
(
(
ts
[
1
].
tv_nsec
/
8
)
+
(
ts
[
1
].
tv_sec
*
1000000000
/
8
),
base
+
map
->
pulse_per
);
if
(
cmd
->
value
>
1
)
{
cmd
->
value
-=
2
;
cmd
->
value
-=
2
;
}
atomic_set
(
&
c
->
count
,
cmd
->
value
);
atomic_set
(
&
c
->
count
,
cmd
->
value
);
c
->
prevts
=
ts
[
0
];
/* our current setpoint */
c
->
prevts
=
ts
[
0
];
/* our current setpoint */
...
...
sw/tools/wr-dio-cmd.c
View file @
8468c898
...
@@ -129,7 +129,7 @@ static int scan_pulse(int argc, char **argv)
...
@@ -129,7 +129,7 @@ static int scan_pulse(int argc, char **argv)
}
}
if
(
cmd
->
t
[
2
].
tv_nsec
<
1000000
)
if
(
cmd
->
t
[
2
].
tv_nsec
<
1000000
)
{
{
fprintf
(
stderr
,
"%s: %s: Frequency is greater than 1 kHz
\n
"
,
fprintf
(
stderr
,
"%s: %s: Frequency is greater than 1 kHz
or higher than 1 s
\n
"
,
prgname
,
argv
[
0
]);
prgname
,
argv
[
0
]);
return
-
1
;
return
-
1
;
}
}
...
@@ -459,7 +459,7 @@ static int scan_irq(int argc, char **argv)
...
@@ -459,7 +459,7 @@ static int scan_irq(int argc, char **argv)
prgname
,
argv
[
0
],
argv
[
1
]);
prgname
,
argv
[
0
],
argv
[
1
]);
return
-
1
;
return
-
1
;
}
}
if
(
cmd
->
t
[
1
].
tv_nsec
<
1000000
||
cmd
->
t
[
1
].
tv_sec
<
2
)
if
(
cmd
->
t
[
1
].
tv_nsec
<
1000000
||
cmd
->
t
[
1
].
tv_sec
>
2
)
{
{
fprintf
(
stderr
,
"%s: %s: Frequency is greater than 1 kHz and lower than 0.5 Hz
\n
"
,
fprintf
(
stderr
,
"%s: %s: Frequency is greater than 1 kHz and lower than 0.5 Hz
\n
"
,
prgname
,
argv
[
0
]);
prgname
,
argv
[
0
]);
...
...
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