Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

usr_state_ctrl: moved under platform common #702

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion boards/ssrc/common
95 changes: 95 additions & 0 deletions platforms/common/include/px4_platform_common/state_ctrl.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
/****************************************************************************
*
* BSD 3-Clause License
*
* Copyright (c) 2024, Technology Innovation Institute
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/

/**
* @file state_ctrl.h
*/

#ifndef STATE_CTRL_H
#define STATE_CTRL_H

#if defined(__PX4_NUTTX) && !defined(CONFIG_BUILD_FLAT)

#include <px4_platform/board_ctrl.h>
#include <px4_platform_common/defines.h>

#define _STATECTRLIOC(_n) (_PX4_IOC(_STATECTRLIOCBASE, _n))

#define STATECTRLIOCREADMOISTATE _STATECTRLIOC(1)
typedef struct statectrliocreadmoistate {
uint8_t *state;
int ret;
} statectrliocreadmoistate_t;

#define STATECTRLIOCWRITEMOISTATE _STATECTRLIOC(2)
typedef struct statectrliocwritemoistate {
uint8_t state;
int ret;
} statectrliocwritemoistate_t;

#define STATECTRLIOCREADFWUPD _STATECTRLIOC(3)
typedef struct statectrliocreadfwupd {
uint8_t *fwupd;
int ret;
} statectrliocreadfwupd_t;

#define STATECTRLIOCWRITEFWUPD _STATECTRLIOC(4)
typedef struct statectrliocwritefwupd {
uint8_t *fwupd;
int ret;
} statectrliocwritefwupd_t;

#endif // __PX4_NUTTX && !CONFIG_BUILD_FLAT

#ifdef __cplusplus
extern "C"
{
#endif

#if defined(__PX4_NUTTX) && !defined(CONFIG_BUILD_FLAT)
int statectrl_ioctl(unsigned int cmd, unsigned long arg);
#endif // __PX4_NUTTX && !CONFIG_BUILD_FLAT

int statectrl_get_moi_state(uint8_t *state);
int statectrl_set_moi_state(uint8_t state);
int statectrl_get_fwupd(uint8_t *fwupd);
int statectrl_set_fwupd(uint8_t *fwupd);

void statectrl_init(void);

#ifdef __cplusplus
}
#endif


#endif // STATE_CTRL_H
1 change: 1 addition & 0 deletions platforms/nuttx/src/px4/common/px4_protected_layers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ add_library(px4_layer
usr_board_ctrl.c
usr_hrt.cpp
usr_mcu_version.cpp
usr_state_ctrl.c
)

target_link_libraries(px4_layer
Expand Down
67 changes: 67 additions & 0 deletions platforms/nuttx/src/px4/common/usr_state_ctrl.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/****************************************************************************
*
* Copyright (c) 2024 Technology Innovation Institute. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name PX4 nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/

#include <nuttx/config.h>
#include <stdbool.h>
#include <px4_platform/board_ctrl.h>
#include <sys/boardctl.h>
#include <px4_platform_common/state_ctrl.h>

int statectrl_get_moi_state(uint8_t *state)
{
statectrliocreadmoistate_t data = {state, 0};
boardctl(STATECTRLIOCREADMOISTATE, (uintptr_t)&data);
return data.ret;
}

int statectrl_set_moi_state(uint8_t state)
{
statectrliocwritemoistate_t data = {state, 0};
boardctl(STATECTRLIOCWRITEMOISTATE, (uintptr_t)&data);
return data.ret;

}

int statectrl_get_fwupd(uint8_t *fwupd)
{
statectrliocreadfwupd_t data = {fwupd, 0};
boardctl(STATECTRLIOCREADFWUPD, (uintptr_t)&data);
return data.ret;
}

int statectrl_set_fwupd(uint8_t *fwupd)
{
statectrliocwritefwupd_t data = {fwupd, 0};
boardctl(STATECTRLIOCWRITEFWUPD, (uintptr_t)&data);
return data.ret;
}