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

Bump third_party/pigweed/repo from 73cac22 to b88cd71 #26133

Merged
merged 21 commits into from
Apr 24, 2023
Merged
Show file tree
Hide file tree
Changes from 9 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
7 changes: 6 additions & 1 deletion examples/all-clusters-app/nxp/mw320/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ mw320_executable("shell_mw320") {
"${chip_root}/src/setup_payload",
]

deps = ["${examples_plat_dir}:syscalls_stub"]

include_dirs = [
"${chip_root}/src/platform/nxp/mw320",
"${examples_plat_dir}/app/project_include",
Expand All @@ -84,7 +86,10 @@ mw320_executable("shell_mw320") {

ldscript = "${examples_plat_dir}/app/ldscripts/88MW320_xx_xxxx_flash.ld"

ldflags = [ "-T" + rebase_path(ldscript, root_build_dir) ]
ldflags = [
"-T" + rebase_path(ldscript, root_build_dir),
"-Wl,--no-warn-rwx-segment"
]
defines = [
"MW320_SHELL_STREAMER",
"SHELL_STREAMER_APP_SPECIFIC",
Expand Down
1 change: 1 addition & 0 deletions examples/contact-sensor-app/nxp/k32w/k32w0/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ k32w0_executable("contact_sensor_app") {
"${chip_root}/src/lib",
"${chip_root}/third_party/mbedtls:mbedtls",
"${k32w0_platform_dir}/app/support:freertos_mbedtls_utils",
"${k32w0_platform_dir}/common:syscalls_stub",
]

if (chip_openthread_ftd) {
Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/nxp/k32w/k32w0/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ k32w0_executable("light_app") {
"${chip_root}/src/lib",
"${chip_root}/third_party/mbedtls:mbedtls",
"${k32w0_platform_dir}/app/support:freertos_mbedtls_utils",
"${k32w0_platform_dir}/common:syscalls_stub",
]

if (chip_openthread_ftd) {
Expand Down
1 change: 1 addition & 0 deletions examples/lock-app/nxp/k32w/k32w0/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ k32w0_executable("lock_app") {
"${chip_root}/third_party/mbedtls:mbedtls",
"${chip_root}/third_party/simw-top-mini:se05x",
"${k32w0_platform_dir}/app/support:freertos_mbedtls_utils",
"${k32w0_platform_dir}/common:syscalls_stub",
]

if (chip_openthread_ftd) {
Expand Down
11 changes: 9 additions & 2 deletions examples/platform/linux/system_rpc_server.cc
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ namespace {
constexpr size_t kMaxTransmissionUnit = 512;
uint16_t socket_port = 33000;

stream::ServerSocket server_socket;
stream::SocketStream socket_stream;

hdlc::RpcChannelOutput hdlc_channel_output(socket_stream, hdlc::kDefaultRpcAddress, "HDLC channel");
Expand All @@ -63,7 +64,10 @@ void Init()
});

PW_LOG_INFO("Starting pw_rpc server on port %d", socket_port);
PW_CHECK_OK(socket_stream.Serve(socket_port));
PW_CHECK_OK(server_socket.Listen(socket_port));
auto accept_result = server_socket.Accept();
PW_CHECK_OK(accept_result.status());
socket_stream = *std::move(accept_result);
}

rpc::Server & Server()
Expand All @@ -88,7 +92,10 @@ Status Start()
// An out of range status indicates the remote end has disconnected.
// Start to serve the connection again, which will allow another
// remote to connect.
PW_CHECK_OK(socket_stream.Serve(socket_port));
PW_CHECK_OK(server_socket.Listen(socket_port));
auto accept_result = server_socket.Accept();
PW_CHECK_OK(accept_result.status());
socket_stream = *std::move(accept_result);
}
continue;
}
Expand Down
19 changes: 19 additions & 0 deletions examples/platform/nxp/k32w/k32w0/common/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Copyright (c) 2023 Project CHIP Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import("//build_overrides/chip.gni")

source_set("syscalls_stub") {
sources = [ "syscalls_stubs.cpp" ]
}
212 changes: 212 additions & 0 deletions examples/platform/nxp/k32w/k32w0/common/syscalls_stubs.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,212 @@
/*
*
* Copyright (c) 2023 Project CHIP Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/*
This file is only used to implement weak syscall stubs
that gcc-arm-none-eabi 12.2.1 expect to link when using Libc
(newlib/libc_nano)
*/

#include <reent.h>
#include <stdarg.h>
#include <stddef.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>

#ifdef __cplusplus
extern "C" {
#endif

int _open(const char* pathname, int flags, int mode);
int _close(int file);
int _fstat(int file, struct stat * st);
int _isatty(int file);
int _lseek(int file, int ptr, int dir);
int _read(int file, char * ptr, int len);
int _write(int file, const char * ptr, int len);

int __attribute__((weak)) _open(const char* pathname, int flags, int mode)
{
(void) pathname;
(void) flags;
(void) mode;
return 0;
}

/**************************************************************************
* @brief
* Close a file.
*
* @param[in] file
* File you want to close.
*
* @return
* Returns 0 when the file is closed.
**************************************************************************/
int __attribute__((weak)) _close(int file)
{
(void) file;
return 0;
}

/**************************************************************************
* @brief Exit the program.
* @param[in] status The value to return to the parent process as the
* exit status (not used).
**************************************************************************/
void __attribute__((weak)) _exit(int status)
{
(void) status;
while (1)
{
} /* Hang here forever... */
}

/*************************************************************************
* @brief
* Status of an open file.
*
* @param[in] file
* Check status for this file.
*
* @param[in] st
* Status information.
*
* @return
* Returns 0 when st_mode is set to character special.
************************************************************************/
int __attribute__((weak)) _fstat(int file, struct stat * st)
{
(void) file;
(void) st;
return 0;
}

/**************************************************************************
* @brief Get process ID.
*************************************************************************/
int __attribute__((weak)) _getpid(void)
{
return 1;
}

/**************************************************************************
* @brief
* Query whether output stream is a terminal.
*
* @param[in] file
* Descriptor for the file.
*
* @return
* Returns 1 when query is done.
**************************************************************************/
int __attribute__((weak)) _isatty(int file)
{
(void) file;
return 1;
}

/**************************************************************************
* @brief Send signal to process.
* @param[in] pid Process id (not used).
* @param[in] sig Signal to send (not used).
*************************************************************************/
int __attribute__((weak)) _kill(int pid, int sig)
{
(void) pid;
(void) sig;
return -1;
}

/**************************************************************************
* @brief
* Set position in a file.
*
* @param[in] file
* Descriptor for the file.
*
* @param[in] ptr
* Poiter to the argument offset.
*
* @param[in] dir
* Directory whence.
*
* @return
* Returns 0 when position is set.
*************************************************************************/
int __attribute__((weak)) _lseek(int file, int ptr, int dir)
{
(void) file;
(void) ptr;
(void) dir;
return 0;
}

/**************************************************************************
* @brief
* Read from a file.
*
* @param[in] file
* Descriptor for the file you want to read from.
*
* @param[in] ptr
* Pointer to the chacaters that are beeing read.
*
* @param[in] len
* Number of characters to be read.
*
* @return
* Number of characters that have been read.
*************************************************************************/
int __attribute__((weak)) _read(int file, char * ptr, int len)
{
(void) file;
(void) ptr;
(void) len;
return 0;
}

/**************************************************************************
* @brief
* Write to a file.
*
* @param[in] file
* Descriptor for the file you want to write to.
*
* @param[in] ptr
* Pointer to the text you want to write
*
* @param[in] len
* Number of characters to be written.
*
* @return
* Number of characters that have been written.
**************************************************************************/
int __attribute__((weak)) _write(int file, const char * ptr, int len)
{
(void) file;
(void) ptr;

return len;
}

#ifdef __cplusplus
}
#endif
4 changes: 4 additions & 0 deletions examples/platform/nxp/mw320/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,7 @@ source_set("config_mw320_chip_examples") {
# sources = [ "app/project_include/CHIPProjectConfig.h" ]
public_configs = [ ":chip_examples_project_config" ]
}

source_set("syscalls_stub") {
sources = [ "syscalls_stubs.cpp" ]
}
Loading