Skip to content

Commit

Permalink
version 2.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ajisilabs committed May 8, 2023
1 parent 591aae0 commit 01f18e4
Show file tree
Hide file tree
Showing 71 changed files with 3,485 additions and 1,425 deletions.
Binary file modified Firmware/pmemdata
Binary file not shown.
Binary file added Firmware/pmemdata_1p5
Binary file not shown.
Binary file modified Firmware/pmemdata_wlan_bt_classic
Binary file not shown.
Binary file added Firmware/pmemdata_wlan_bt_classic_1p5
Binary file not shown.
4 changes: 0 additions & 4 deletions Readme_OSD.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,13 @@ Package
=======
RS9116.NB0.NL.GNU.LNX.OSD.X.X.X
├── Readme_OSD.txt
├── ReleaseNotes_OSD.pdf
├── scripts
├── Firmware
└── rsi

Content Description
===================

- ReleaseNotes_OSD.pdf
This document contains supported features, hardware and software requirements, and known issues of this release.

- Scripts
This folder contains configuration files of supplicant, hostapd and scripts for running dhcp server.

Expand Down
Binary file removed ReleaseNotes_OSD.pdf
Binary file not shown.
25 changes: 25 additions & 0 deletions rsi/Automation_README
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Note :
1. osd_common_insert.sh file is used to enable different configuration option used by the driver.
2. start_rs9116.sh file is used to load the driver along with different modes.
3. To use these scripts just connect our RS9116 Module to the platform and run start_rs9116.sh file.Command to execute the file : ./start_rs9116.sh <mode>
4. Update sta_settings.conf file present in scripts folder as per use case.
5. Update ap configuration files (i.e. ap_open.conf,ap_wpa.conf etc) present in scripts folder as per use case.
Diffrent modes :
• AP
• STA
• AP_STA(Here STA will be initiated first then AP. Configure the ap configuration files according before running the script).
• BT
• BLE
• STA_BT
• AP_BT
• STA_BLE
• AP_BLE
• STA_BT_BLE
• AP_BT_BLE
Command to execute the file : ./start_rs9116.sh <mode>

Note :
1. For IMX6 Wand Borad do the following updation before running the script :
a. Change "killall" commands with "pkill" in the script(start_rs9116.sh file).
b. Disable "rfkill unblock all " command from the script(start_rs9116.sh file).
2. For Linux PCs and RPI, no need to update anything.
1 change: 1 addition & 0 deletions rsi/Kconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
config WLAN_VENDOR_RSI
bool "Redpine Signals Inc devices"
default y
Expand Down
38 changes: 6 additions & 32 deletions rsi/Makefile
Original file line number Diff line number Diff line change
@@ -1,32 +1,4 @@
#/*
# Copyright (c) 2017 Redpine Signals Inc. 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 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.
#*/
# SPDX-License-Identifier: GPL-2.0-only

SUPP_DIR=$(PWD)/supplicant
KERNELRELEASE=$(shell uname -r)
Expand Down Expand Up @@ -83,13 +55,13 @@ also need to enabled CONFIG_RS9116_FLASH_MODE flag
#CONFIG_RSI_LOAD_FW_FROM_FLASH_ONLY=y

#Uncomment below line to ignore -84 sdio write failure error
#COMMAND_84_ERROR_WAR=y
COMMAND_84_ERROR_WAR=y

#Uncomment below line to offload scanning to driver as kernel verion above 4.20.17 \
mac80211 will do scan
OFFLOAD_SCAN_TO_DEVICE=y

EXTRA_CFLAGS += -DLINUX -Wimplicit -Wstrict-prototypes -Wall -Werror
EXTRA_CFLAGS += -DLINUX -Wimplicit -Wstrict-prototypes -Wall -Werror -Wno-implicit-fallthrough
EXTRA_CFLAGS += -I$(PWD)/include
EXTRA_CFLAGS += -DCONFIG_RSI_DEBUGFS

Expand Down Expand Up @@ -198,8 +170,10 @@ rsi_91x-objs := $(RSI_91X_OBJS)
all:
@echo -e "\033[32mCompiling RSI drivers...\033[0m"
make -C$(KERNELDIR)/ M=$(PWD) modules
@echo -e "application compilation"
chmod 777 start_rs9116.sh
chmod 777 osd_common_insert.sh
make CC="$(CC)" ROOT_DIR=$(ROOT_DIR) -C $(PWD)/apps
@echo -e "\033[32mCompilation done SUCCESSFULLY\033[0m"

clean:
make -C$(KERNELDIR)/ M=$(PWD) clean
Expand Down
32 changes: 3 additions & 29 deletions rsi/Makefile_ker
Original file line number Diff line number Diff line change
@@ -1,39 +1,13 @@
#/*
# Copyright (c) 2017 Redpine Signals Inc. 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 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.
#*/
# SPDX-License-Identifier: GPL-2.0-only

rsi_91x-y += rsi_91x_main.o
rsi_91x-y += rsi_91x_core.o
rsi_91x-y += rsi_91x_mac80211.o
rsi_91x-y += rsi_91x_mgmt.o
rsi_91x-y += rsi_91x_hal.o
rsi_91x-y += rsi_91x_ps.o
rsi_91x-y += rsi_91x_per.o
rsi_91x-y += rsi_91x_nlsock.o
rsi_91x-$(CONFIG_ARCH_HAVE_CUSTOM_GPIO_H) += rsi_91x_gpio.o
rsi_91x-$(CONFIG_RSI_DEBUGFS) += rsi_91x_debugfs.o
rsi_91x-$(CONFIG_RSI_BT_ALONE) += rsi_91x_hci.o
Expand Down
2 changes: 1 addition & 1 deletion rsi/README
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ Concurrent Mode
===============
* Concurrent mode is supported only in dev_oper_mode = 1[Wi-Fi alone mode].
* You can create AP or Station on default interface.
* To create a new interface use below command. User can create upto 4 vaps[3 - AP's and 1 - STA].
* To create a new interface use below command.

* For AP
$> iw dev <intf_name> interface add <new_intf> type __ap
Expand Down
2 changes: 1 addition & 1 deletion rsi/apps/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cpy=cp -rf


all:
@echo -e "application Makefile"
@echo -e "\033[32mCompiling Application...\033[0m"
$(CC) -o receive per_receive.c per_sock.c $(CFLAGS)
$(CC) -o bt_util bt_util.c per_sock.c $(CFLAGS)
$(CC) -o onebox_util update_wlan_gain_table.c onebox_util.c per_sock.c $(CFLAGS)
Expand Down
21 changes: 4 additions & 17 deletions rsi/apps/bt_util.c
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
/*******************************************************************************
* @file bt_util.c
* @brief This file includes bt_util application which is used to send a frame to driver
* and receive response from the driver
*******************************************************************************
* # License
* <b>Copyright 2020 Silicon Laboratories Inc. www.silabs.com</b>
*******************************************************************************
*
* The licensor of this software is Silicon Laboratories Inc. Your use of this
* software is governed by the terms of Silicon Labs Master Software License
* Agreement (MSLA) available at
* www.silabs.com/about-us/legal/master-software-license-agreement. This
* software is distributed to you in Source Code format and is governed by the
* sections of the MSLA applicable to Source Code.
*
******************************************************************************/
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright 2020-2023 Silicon Labs, Inc.
*/

#include <stdio.h>
#include <sys/socket.h>
Expand Down
20 changes: 4 additions & 16 deletions rsi/apps/bt_util.h
Original file line number Diff line number Diff line change
@@ -1,19 +1,7 @@
/*******************************************************************************
* @file bt_util.h
* @brief This file includes bt_util application related macros and declarations
*******************************************************************************
* # License
* <b>Copyright 2020 Silicon Laboratories Inc. www.silabs.com</b>
*******************************************************************************
*
* The licensor of this software is Silicon Laboratories Inc. Your use of this
* software is governed by the terms of Silicon Labs Master Software License
* Agreement (MSLA) available at
* www.silabs.com/about-us/legal/master-software-license-agreement. This
* software is distributed to you in Source Code format and is governed by the
* sections of the MSLA applicable to Source Code.
*
******************************************************************************/
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright 2020-2023 Silicon Labs, Inc.
*/

#ifndef _BT_UTIL_H_
#define _BT_UTIL_H_
Expand Down
95 changes: 68 additions & 27 deletions rsi/apps/onebox_util.c
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
/*******************************************************************************
* @file onebox_util.c
* @brief This file include onebox_util application which is used to parse the user
* command and call related function.
*******************************************************************************
* # License
* <b>Copyright 2020 Silicon Laboratories Inc. www.silabs.com</b>
*******************************************************************************
*
* The licensor of this software is Silicon Laboratories Inc. Your use of this
* software is governed by the terms of Silicon Labs Master Software License
* Agreement (MSLA) available at
* www.silabs.com/about-us/legal/master-software-license-agreement. This
* software is distributed to you in Source Code format and is governed by the
* sections of the MSLA applicable to Source Code.
*
******************************************************************************/
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright 2020-2023 Silicon Labs, Inc.
*/

#include <stdio.h>
#include <sys/socket.h>
Expand Down Expand Up @@ -43,9 +30,22 @@ int main(int argc, char *argv[])
struct bb_rf_param_t bb_rf_params;
struct bb_rf_param_t bb_rf_read;
struct efuse_content_t *efuse_content;
struct fltr_bcast bcast;
int length;
int multiple_bb_read = 0;

//_9117_CODE_START
int rltime_enable;
unsigned long int rltime_timer;
int tx_length, rx_length;
#ifdef CONFIG_TWT_SUPPORT
int twt_status;
rsi_twt_user_params twt_params;
rsi_twt_status_resp *twt_resp = malloc(sizeof(rsi_twt_status_resp));
#endif
unsigned short int bmiss_threshold_value, prev_bmiss_threshold;
unsigned short int keep_alive_period;
//_9117_CODE_END
short int received_rssi;
struct nlmsghdr *nlh;

if (argc < 3) {
Expand Down Expand Up @@ -184,6 +184,45 @@ int main(int argc, char *argv[])
free(nlh);
}
break;
case RSI_GET_RSSI:
if (argc != 3) {
ONEBOX_PRINT("Usage: onebox_util rpine0 get_rssi\n");
return ONEBOX_STATUS_FAILURE;
}
if (send_get_rssi_frame_to_drv(sfd) < 0) {
ONEBOX_PRINT("Error while issuing get_rssi ioctl\n");
ret = ONEBOX_STATUS_FAILURE;
break;
} else {
nlh = common_recv_mesg_wrapper(sfd, 2);
memcpy(&received_rssi, (short int *)NLMSG_DATA(nlh), 2);
printf(" ***** Received RSSI is =-%d *****\n ", received_rssi);
}
break;
case RSI_FILTER_BCAST: {
if (argc != 6) {
ONEBOX_PRINT("Usage: onebox_util rpine0 filter_bcast beacon_drop_threshold(ms) filter_bcast_in_tim "
"filter_bcast_tim_till_next_cmd\n");
return ONEBOX_STATUS_FAILURE;
}
bcast.beacon_drop_threshold = atoi(argv[3]);
bcast.filter_bcast_in_tim = atoi(argv[4]);
if (bcast.filter_bcast_in_tim != 0 && bcast.filter_bcast_in_tim != 1) {
printf("Valid value for filter_bcast_in_tim argument is either 0 or 1\n");
return ONEBOX_STATUS_FAILURE;
}
bcast.filter_bcast_tim_till_next_cmd = atoi(argv[5]);
if (bcast.filter_bcast_tim_till_next_cmd != 0 && bcast.filter_bcast_tim_till_next_cmd != 1) {
printf("Valid value for filter_bcast_tim_till_next_cmd argument is either 0 or 1\n");
return ONEBOX_STATUS_FAILURE;
}
ret = send_filter_broadcast_frame_to_drv(bcast, sfd);
if (ret < 0) {
ONEBOX_PRINT("Error while issuing filter_bcast ioctl\n");
ret = ONEBOX_STATUS_FAILURE;
}
break;
}
default:
return ONEBOX_STATUS_FAILURE;
}
Expand All @@ -195,19 +234,20 @@ int getcmdnumber(char *command, char *ifName)
{
if (!strcmp(command, "update_wlan_gain_table") && !strncmp(ifName, "rpine", 5)) {
return UPDATE_WLAN_GAIN_TABLE;
}
if (!strcmp(command, "print_efuse_map") && !strncmp(ifName, "rpine", 5)) {
} else if (!strcmp(command, "print_efuse_map") && !strncmp(ifName, "rpine", 5)) {
return EFUSE_MAP;
}
if (!strcmp(command, "bb_write") && !strncmp(ifName, "rpine", 5)) {
} else if (!strcmp(command, "bb_write") && !strncmp(ifName, "rpine", 5)) {
return RSI_SET_BB_WRITE;
}
if (!strcmp(command, "bb_read_multiple") && !strncmp(ifName, "rpine", 5)) {
} else if (!strcmp(command, "bb_read_multiple") && !strncmp(ifName, "rpine", 5)) {
return RSI_MULTIPLE_BB_READ;
}
if (!strcmp(command, "bb_read") && !strncmp(ifName, "rpine", 5)) {
} else if (!strcmp(command, "bb_read") && !strncmp(ifName, "rpine", 5)) {
return RSI_SET_BB_READ;
} else {
} else if (!strcmp(command, "filter_bcast") && !strncmp(ifName, "rpine", 5)) {
return RSI_FILTER_BCAST;
} else if (!strcmp(command, "get_rssi") && !strncmp(ifName, "rpine", 5)) {
return RSI_GET_RSSI;
}
else {
ONEBOX_PRINT("Error: Wrong command , Please follow usage...\n");
usage();
return ONEBOX_STATUS_FAILURE;
Expand All @@ -222,3 +262,4 @@ void usage()
ONEBOX_PRINT("Usage:./onebox_util rpine0 print_efuse_map\n");
return;
}

Loading

0 comments on commit 01f18e4

Please sign in to comment.