pkarashchenko commented on code in PR #6427:
URL: https://github.com/apache/incubator-nuttx/pull/6427#discussion_r897208843
##########
drivers/wireless/ieee80211/bcm43xxx/bcmf_core.c:
##########
@@ -328,24 +331,107 @@ int bcmf_upload_file(FAR struct bcmf_sdio_dev_s *sbus,
uint32_t address,
int bcmf_upload_nvram(FAR struct bcmf_sdio_dev_s *sbus)
{
- int ret;
- uint32_t nvram_sz;
+ FAR uint8_t *nvram_buf = sbus->chip->nvram_image;
+ uint32_t nvram_sz = *sbus->chip->nvram_image_size;
uint32_t token;
+ int ret;
+
+#ifdef CONFIG_IEEE80211_BROADCOM_FWFILES
+ FAR const char *nvfile = CONFIG_IEEE80211_BROADCOM_NVFILENAME;
+ bool skipline = false;
+ struct file finfo;
+ struct stat stat;
+ FAR uint8_t *buf;
+ int i;
+
+ if (strlen(nvfile) <= 0)
+ {
+ goto out;
+ }
+
+ ret = file_open(&finfo, nvfile, O_RDONLY);
+ if (ret < 0)
+ {
+ goto out;
+ }
+
+ ret = file_fstat(&finfo, &stat);
+ if (ret < 0 || stat.st_size <= 0)
+ {
+ goto out;
+ }
+
+ /* Round up the ram buffer size */
+
+ stat.st_size = (stat.st_size + 63) & (-63);
Review Comment:
```suggestion
stat.st_size = (stat.st_size + 63) & (~63);
```
##########
drivers/wireless/ieee80211/bcm43xxx/bcmf_core.c:
##########
@@ -328,24 +331,107 @@ int bcmf_upload_file(FAR struct bcmf_sdio_dev_s *sbus,
uint32_t address,
int bcmf_upload_nvram(FAR struct bcmf_sdio_dev_s *sbus)
{
- int ret;
- uint32_t nvram_sz;
+ FAR uint8_t *nvram_buf = sbus->chip->nvram_image;
+ uint32_t nvram_sz = *sbus->chip->nvram_image_size;
uint32_t token;
+ int ret;
+
+#ifdef CONFIG_IEEE80211_BROADCOM_FWFILES
+ FAR const char *nvfile = CONFIG_IEEE80211_BROADCOM_NVFILENAME;
+ bool skipline = false;
+ struct file finfo;
+ struct stat stat;
+ FAR uint8_t *buf;
+ int i;
+
+ if (strlen(nvfile) <= 0)
+ {
+ goto out;
+ }
+
+ ret = file_open(&finfo, nvfile, O_RDONLY);
+ if (ret < 0)
+ {
+ goto out;
+ }
+
+ ret = file_fstat(&finfo, &stat);
+ if (ret < 0 || stat.st_size <= 0)
+ {
+ goto out;
+ }
+
+ /* Round up the ram buffer size */
+
+ stat.st_size = (stat.st_size + 63) & (-63);
+
+ buf = (FAR uint8_t *)kmm_malloc(stat.st_size);
+ if (buf == NULL)
+ {
+ goto out;
+ }
+
+ /* Convert text pattern:
+ * 1. Remove the comment line (Prefix with '#')
+ * 2. Convert LF('\n') to NULL'\0'
+ */
+
+ ret = file_read(&finfo, buf, stat.st_size);
+ if (ret <= 0)
+ {
+ kmm_free(buf);
+ goto out;
+ }
+
+ nvram_buf = buf;
+
+ for (i = 0; i < ret; i++)
+ {
+ if (nvram_buf[i] == '\n')
+ {
+ if (buf != nvram_buf && *(buf - 1) != '\0')
+ {
+ *buf++ = '\0';
+ }
+
+ skipline = false;
+ }
+ else if (nvram_buf[i] == '#')
+ {
+ skipline = true;
+ }
+ else if (!skipline && (nvram_buf + i) != buf)
+ {
+ *buf++ = nvram_buf[i];
+ }
+ }
+
+ nvram_sz = buf - nvram_buf;
+
+out:
+ file_close(&finfo);
+#endif
/* Round up the size of the image */
- nvram_sz = (*sbus->chip->nvram_image_size + 63) & (-64);
+ nvram_sz = (nvram_sz + 63) & (-63);
Review Comment:
```suggestion
nvram_sz = (nvram_sz + 63) & (~63);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
