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
eb52327f
Commit
eb52327f
authored
Sep 21, 2020
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changed name to help Eclipse resolve NONE symbol
parent
a680f5e6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
detect_sensors.c
src/drivers/elphel/detect_sensors.c
+5
-5
detect_sensors.h
src/drivers/elphel/detect_sensors.h
+1
-1
No files found.
src/drivers/elphel/detect_sensors.c
View file @
eb52327f
...
@@ -64,8 +64,8 @@ struct sensor_name_t {
...
@@ -64,8 +64,8 @@ struct sensor_name_t {
//typedef enum {NONE,PARALLEL12,HISPI} sens_iface_t; ///< Sensor port interface type
//typedef enum {NONE,PARALLEL12,HISPI} sens_iface_t; ///< Sensor port interface type
const
struct
sensor_name_t
sensor_names
[]
=
{
const
struct
sensor_name_t
sensor_names
[]
=
{
{.
name
=
"detect"
,
.
type
=
3
,
.
iface
=
NONE
,
.
code
=
0
},
// to be automatically detected
{.
name
=
"detect"
,
.
type
=
3
,
.
iface
=
IFACE_
NONE
,
.
code
=
0
},
// to be automatically detected
{.
name
=
"none"
,
.
type
=
3
,
.
iface
=
NONE
,
.
code
=
SENSOR_NONE
},
// no device attached
{.
name
=
"none"
,
.
type
=
3
,
.
iface
=
IFACE_
NONE
,
.
code
=
SENSOR_NONE
},
// no device attached
{.
name
=
"mux10359"
,
.
type
=
2
,
.
iface
=
PARALLEL12
,
.
code
=
SENSOR_MUX_10359
},
// no device attached
{.
name
=
"mux10359"
,
.
type
=
2
,
.
iface
=
PARALLEL12
,
.
code
=
SENSOR_MUX_10359
},
// no device attached
{.
name
=
"zr32112"
,
.
type
=
1
,
.
iface
=
PARALLEL12
,
.
code
=
SENSOR_ZR32112
},
// Zoran ZR32112
{.
name
=
"zr32112"
,
.
type
=
1
,
.
iface
=
PARALLEL12
,
.
code
=
SENSOR_ZR32112
},
// Zoran ZR32112
{.
name
=
"zr32212"
,
.
type
=
1
,
.
iface
=
PARALLEL12
,
.
code
=
SENSOR_ZR32212
},
// Zoran ZR32212
{.
name
=
"zr32212"
,
.
type
=
1
,
.
iface
=
PARALLEL12
,
.
code
=
SENSOR_ZR32212
},
// Zoran ZR32212
...
@@ -80,7 +80,7 @@ const struct sensor_name_t sensor_names[] ={
...
@@ -80,7 +80,7 @@ const struct sensor_name_t sensor_names[] ={
{.
name
=
"ibis51300"
,
.
type
=
1
,
.
iface
=
PARALLEL12
,
.
code
=
SENSOR_IBIS51300
},
// FillFactory IBIS51300
{.
name
=
"ibis51300"
,
.
type
=
1
,
.
iface
=
PARALLEL12
,
.
code
=
SENSOR_IBIS51300
},
// FillFactory IBIS51300
{.
name
=
"kai11002"
,
.
type
=
1
,
.
iface
=
PARALLEL12
,
.
code
=
SENSOR_KAI11000
},
// Kodak KAI11002
{.
name
=
"kai11002"
,
.
type
=
1
,
.
iface
=
PARALLEL12
,
.
code
=
SENSOR_KAI11000
},
// Kodak KAI11002
{.
name
=
"lepton35"
,
.
type
=
1
,
.
iface
=
VOSPI
,
.
code
=
SENSOR_LEPTON35
},
// Kodak KAI11002
{.
name
=
"lepton35"
,
.
type
=
1
,
.
iface
=
VOSPI
,
.
code
=
SENSOR_LEPTON35
},
// Kodak KAI11002
{.
name
=
NULL
,
.
type
=
0
,
.
iface
=
NONE
,
.
code
=
0
}
// end of list
{.
name
=
NULL
,
.
type
=
0
,
.
iface
=
IFACE_
NONE
,
.
code
=
0
}
// end of list
};
};
static
sens_iface_t
port_iface
[
SENSOR_PORTS
];
static
sens_iface_t
port_iface
[
SENSOR_PORTS
];
//#define DETECT_SENSOR 1 ///< Include sensors, May be OR-ed when looking for sensor/multiplexer code/name
//#define DETECT_SENSOR 1 ///< Include sensors, May be OR-ed when looking for sensor/multiplexer code/name
...
@@ -126,7 +126,7 @@ sens_iface_t get_iface_by_code(int code, ///< sensor code
...
@@ -126,7 +126,7 @@ sens_iface_t get_iface_by_code(int code, ///< sensor code
return
sensor_names
[
i
].
iface
;
return
sensor_names
[
i
].
iface
;
}
}
}
}
return
NONE
;
return
IFACE_
NONE
;
}
}
/** Get sensor port multiplexer type */
/** Get sensor port multiplexer type */
...
@@ -180,7 +180,7 @@ int get_subchannels(int port) ///< Sensor port
...
@@ -180,7 +180,7 @@ int get_subchannels(int port) ///< Sensor port
void
update_port_iface
(
int
port
)
///< Sensor port number (0..3)
void
update_port_iface
(
int
port
)
///< Sensor port number (0..3)
{
{
sens_iface_t
iface
=
get_iface_by_code
(
get_detected_mux_code
(
port
),
DETECT_MUX
);
sens_iface_t
iface
=
get_iface_by_code
(
get_detected_mux_code
(
port
),
DETECT_MUX
);
if
(
iface
!=
NONE
)
{
if
(
iface
!=
IFACE_
NONE
)
{
port_iface
[
port
]
=
iface
;
port_iface
[
port
]
=
iface
;
return
;
return
;
}
}
...
...
src/drivers/elphel/detect_sensors.h
View file @
eb52327f
...
@@ -45,7 +45,7 @@ struct sensor_port_config_t {
...
@@ -45,7 +45,7 @@ struct sensor_port_config_t {
extern
struct
sensor_port_config_t
*
pSensorPortConfig
;
extern
struct
sensor_port_config_t
*
pSensorPortConfig
;
typedef
enum
{
NONE
,
PARALLEL12
,
HISPI4
,
VOSPI
}
sens_iface_t
;
///< Sensor port interface type
typedef
enum
{
IFACE_
NONE
,
PARALLEL12
,
HISPI4
,
VOSPI
}
sens_iface_t
;
///< Sensor port interface type
int
get_code_by_name
(
const
char
*
name
,
int
type
);
int
get_code_by_name
(
const
char
*
name
,
int
type
);
const
char
*
get_name_by_code
(
int
code
,
int
type
);
const
char
*
get_name_by_code
(
int
code
,
int
type
);
...
...
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