Skip to content

Commit a1a656f

Browse files
authored
Merge pull request #4817 from greedyhao/ab32
[bsp][bluetrum] fix audio replay device problem
2 parents 32acc94 + a3db13b commit a1a656f

File tree

5 files changed

+51
-20
lines changed

5 files changed

+51
-20
lines changed

bsp/bluetrum/ab32vg1-ab-prougen/.config

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ CONFIG_RT_USING_DEVICE_IPC=y
122122
CONFIG_RT_PIPE_BUFSZ=512
123123
# CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set
124124
CONFIG_RT_USING_SERIAL=y
125+
CONFIG_RT_USING_SERIAL_V1=y
126+
# CONFIG_RT_USING_SERIAL_V2 is not set
125127
# CONFIG_RT_SERIAL_USING_DMA is not set
126128
CONFIG_RT_SERIAL_RB_BUFSZ=64
127129
# CONFIG_RT_USING_CAN is not set
@@ -197,6 +199,7 @@ CONFIG_RT_LIBC_FIXED_TIMEZONE=8
197199
# CONFIG_RT_USING_RYM is not set
198200
# CONFIG_RT_USING_ULOG is not set
199201
# CONFIG_RT_USING_UTEST is not set
202+
# CONFIG_RT_USING_RT_LINK is not set
200203

201204
#
202205
# RT-Thread Utestcases
@@ -320,6 +323,8 @@ CONFIG_RT_LIBC_FIXED_TIMEZONE=8
320323
# CONFIG_PKG_USING_AZUREGUIX is not set
321324
# CONFIG_PKG_USING_TOUCHGFX2RTT is not set
322325
# CONFIG_PKG_USING_NUEMWIN is not set
326+
# CONFIG_PKG_USING_MP3PLAYER is not set
327+
# CONFIG_PKG_USING_TINYJPEG is not set
323328

324329
#
325330
# tools packages
@@ -328,6 +333,7 @@ CONFIG_RT_LIBC_FIXED_TIMEZONE=8
328333
# CONFIG_PKG_USING_EASYFLASH is not set
329334
# CONFIG_PKG_USING_EASYLOGGER is not set
330335
# CONFIG_PKG_USING_SYSTEMVIEW is not set
336+
# CONFIG_PKG_USING_SEGGER_RTT is not set
331337
# CONFIG_PKG_USING_RDB is not set
332338
# CONFIG_PKG_USING_QRCODE is not set
333339
# CONFIG_PKG_USING_ULOG_EASYFLASH is not set
@@ -365,6 +371,24 @@ CONFIG_RT_LIBC_FIXED_TIMEZONE=8
365371
#
366372
# system packages
367373
#
374+
375+
#
376+
# acceleration: Assembly language or algorithmic acceleration packages
377+
#
378+
# CONFIG_PKG_USING_RT_MEMCPY_CM is not set
379+
# CONFIG_PKG_USING_QFPLIB_M0_FULL is not set
380+
# CONFIG_PKG_USING_QFPLIB_M0_TINY is not set
381+
# CONFIG_PKG_USING_QFPLIB_M3 is not set
382+
383+
#
384+
# Micrium: Micrium software products porting for RT-Thread
385+
#
386+
# CONFIG_PKG_USING_UCOSIII_WRAPPER is not set
387+
# CONFIG_PKG_USING_UCOSII_WRAPPER is not set
388+
# CONFIG_PKG_USING_UC_CRC is not set
389+
# CONFIG_PKG_USING_UC_CLK is not set
390+
# CONFIG_PKG_USING_UC_COMMON is not set
391+
# CONFIG_PKG_USING_UC_MODBUS is not set
368392
# CONFIG_PKG_USING_GUIENGINE is not set
369393
# CONFIG_PKG_USING_CAIRO is not set
370394
# CONFIG_PKG_USING_PIXMAN is not set
@@ -389,23 +413,9 @@ CONFIG_RT_LIBC_FIXED_TIMEZONE=8
389413
# CONFIG_PKG_USING_RAMDISK is not set
390414
# CONFIG_PKG_USING_MININI is not set
391415
# CONFIG_PKG_USING_QBOOT is not set
392-
393-
#
394-
# Micrium: Micrium software products porting for RT-Thread
395-
#
396-
# CONFIG_PKG_USING_UCOSIII_WRAPPER is not set
397-
# CONFIG_PKG_USING_UCOSII_WRAPPER is not set
398-
# CONFIG_PKG_USING_UC_CRC is not set
399-
# CONFIG_PKG_USING_UC_CLK is not set
400-
# CONFIG_PKG_USING_UC_COMMON is not set
401-
# CONFIG_PKG_USING_UC_MODBUS is not set
402416
# CONFIG_PKG_USING_PPOOL is not set
403417
# CONFIG_PKG_USING_OPENAMP is not set
404418
# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set
405-
# CONFIG_PKG_USING_RT_MEMCPY_CM is not set
406-
# CONFIG_PKG_USING_QFPLIB_M0_FULL is not set
407-
# CONFIG_PKG_USING_QFPLIB_M0_TINY is not set
408-
# CONFIG_PKG_USING_QFPLIB_M3 is not set
409419
# CONFIG_PKG_USING_LPM is not set
410420
# CONFIG_PKG_USING_TLSF is not set
411421
# CONFIG_PKG_USING_EVENT_RECORDER is not set
@@ -433,7 +443,6 @@ CONFIG_RT_LIBC_FIXED_TIMEZONE=8
433443
# CONFIG_PKG_USING_WM_LIBRARIES is not set
434444
# CONFIG_PKG_USING_KENDRYTE_SDK is not set
435445
# CONFIG_PKG_USING_INFRARED is not set
436-
# CONFIG_PKG_USING_ROSSERIAL is not set
437446
# CONFIG_PKG_USING_AGILE_BUTTON is not set
438447
# CONFIG_PKG_USING_AGILE_LED is not set
439448
# CONFIG_PKG_USING_AT24CXX is not set
@@ -477,6 +486,9 @@ CONFIG_RT_LIBC_FIXED_TIMEZONE=8
477486
# CONFIG_PKG_USING_MFOC is not set
478487
# CONFIG_PKG_USING_TMC51XX is not set
479488
# CONFIG_PKG_USING_TCA9534 is not set
489+
# CONFIG_PKG_USING_KOBUKI is not set
490+
# CONFIG_PKG_USING_ROSSERIAL is not set
491+
# CONFIG_PKG_USING_MICRO_ROS is not set
480492

481493
#
482494
# AI packages

bsp/bluetrum/ab32vg1-ab-prougen/applications/mnt.c

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include <rtthread.h>
1212

13-
#ifdef BSP_USING_SDIO
13+
#if defined (BSP_USING_SDCARD)
1414

1515
#include <dfs_elm.h>
1616
#include <dfs_fs.h>
@@ -58,4 +58,23 @@ int ab32_sdcard_mount(void)
5858
return RT_EOK;
5959
}
6060
INIT_APP_EXPORT(ab32_sdcard_mount);
61+
#elif defined (RT_USING_DFS_ROMFS)
62+
63+
#include <dfs_fs.h>
64+
#include "dfs_romfs.h"
65+
66+
int ab32_romfs_mount(void)
67+
{
68+
if (dfs_mount(RT_NULL, "/", "rom", 0, &(romfs_root)) == 0)
69+
{
70+
rt_kprintf("ROM file system initializated!\n");
71+
}
72+
else
73+
{
74+
rt_kprintf("ROM file system initializate failed!\n");
75+
}
76+
77+
return 0;
78+
}
79+
INIT_ENV_EXPORT(ab32_romfs_mount);
6180
#endif

bsp/bluetrum/ab32vg1-ab-prougen/board/ports/audio/drv_sound.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,8 +388,6 @@ static rt_err_t sound_stop(struct rt_audio_device *audio, int stream)
388388

389389
if (stream == AUDIO_STREAM_REPLAY)
390390
{
391-
DACDIGCON0 = 0;
392-
AUBUFCON &= ~BIT(4);
393391
LOG_D("close sound device");
394392
}
395393

bsp/bluetrum/ab32vg1-ab-prougen/link.lds

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ SECTIONS
3434
} > init
3535

3636
.ram1 __ram1_vma : {
37-
. = ALIGN(4);
3837
/* section information for initial */
38+
. = ALIGN(4);
3939
__rt_init_start = .;
4040
KEEP(*(SORT(.rti_fn*)))
4141
__rt_init_end = .;
@@ -75,7 +75,6 @@ SECTIONS
7575
KEEP(*(.vector))
7676
*(.irq.cache)
7777
*(.irq*)
78-
*components*src**.o (.text* .rodata*)
7978
*ab32vg1_hal**.o (.text* .rodata*)
8079
*drv_gpio.o (.text* .rodata*)
8180
*drv_usart.o (.rodata*)

bsp/bluetrum/ab32vg1-ab-prougen/rtconfig.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
#define RT_USING_DEVICE_IPC
8282
#define RT_PIPE_BUFSZ 512
8383
#define RT_USING_SERIAL
84+
#define RT_USING_SERIAL_V1
8485
#define RT_SERIAL_RB_BUFSZ 64
8586
#define RT_USING_PIN
8687

@@ -145,6 +146,8 @@
145146

146147
/* system packages */
147148

149+
/* acceleration: Assembly language or algorithmic acceleration packages */
150+
148151

149152
/* Micrium: Micrium software products porting for RT-Thread */
150153

0 commit comments

Comments
 (0)