Skip to content

Commit 13e0671

Browse files
mysterywolfRbb666
mysterywolf
authored and
Rbb666
committed
[fal] using rt-thread raw API instead of std API
1 parent fbcda2a commit 13e0671

File tree

41 files changed

+621
-652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+621
-652
lines changed

Diff for: ‎bsp/allwinner/d1s/ports/fal/fal_norflash_sfud_port.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
#include <sfud.h>
1717

1818
static int init(void);
19-
static int read(long offset, uint8_t *buf, size_t size);
20-
static int write(long offset, const uint8_t *buf, size_t size);
21-
static int erase(long offset, size_t size);
19+
static int read(long offset, rt_uint8_t *buf, rt_size_t size);
20+
static int write(long offset, const rt_uint8_t *buf, rt_size_t size);
21+
static int erase(long offset, rt_size_t size);
2222

2323
extern sfud_flash sfud_norflash0;
2424
struct fal_flash_dev nor_flash0 =
@@ -30,13 +30,13 @@ struct fal_flash_dev nor_flash0 =
3030
{init, read, write, erase}
3131
};
3232

33-
static int read(long offset, uint8_t *buf, size_t size)
33+
static int read(long offset, rt_uint8_t *buf, rt_size_t size)
3434
{
3535
sfud_read(&sfud_norflash0, nor_flash0.addr + offset, size, buf);
3636
return size;
3737
}
3838

39-
static int write(long offset, const uint8_t *buf, size_t size)
39+
static int write(long offset, const rt_uint8_t *buf, rt_size_t size)
4040
{
4141
if (sfud_write(&sfud_norflash0, nor_flash0.addr + offset, size, buf) != SFUD_SUCCESS)
4242
{
@@ -46,7 +46,7 @@ static int write(long offset, const uint8_t *buf, size_t size)
4646
return size;
4747
}
4848

49-
static int erase(long offset, size_t size)
49+
static int erase(long offset, rt_size_t size)
5050
{
5151
if (sfud_erase(&sfud_norflash0, nor_flash0.addr + offset, size) != SFUD_SUCCESS)
5252
{

Diff for: ‎bsp/allwinner/d1s/ports/fal/fal_sd_sfud_port.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
rt_device_t sd_dev;
2020
#define SECTOR_SIZE 512
2121
static int init(void);
22-
static int read(long offset, uint8_t *buf, size_t size);
23-
static int write(long offset, const uint8_t *buf, size_t size);
24-
static int erase(long offset, size_t size);
22+
static int read(long offset, rt_uint8_t *buf, rt_size_t size);
23+
static int write(long offset, const rt_uint8_t *buf, rt_size_t size);
24+
static int erase(long offset, rt_size_t size);
2525

2626
struct fal_flash_dev sd_card = {
2727
"sdcard0", /* name string match yml file */
@@ -31,13 +31,13 @@ struct fal_flash_dev sd_card = {
3131
{init, read, write, erase}
3232
};
3333

34-
static int read(long offset, uint8_t *buf, size_t size)
34+
static int read(long offset, rt_uint8_t *buf, rt_size_t size)
3535
{
3636
rt_size_t sector_pos;
3737
rt_size_t sector_offset;
3838
rt_size_t remain_size = size;
3939
rt_size_t req_size;
40-
rt_align(4) uint8_t buffer[SECTOR_SIZE];
40+
rt_align(4) rt_uint8_t buffer[SECTOR_SIZE];
4141

4242
while (remain_size)
4343
{
@@ -54,13 +54,13 @@ static int read(long offset, uint8_t *buf, size_t size)
5454
return size;
5555
}
5656

57-
static int write(long offset, const uint8_t *buf, size_t size)
57+
static int write(long offset, const rt_uint8_t *buf, rt_size_t size)
5858
{
5959
rt_size_t sector_pos;
6060
rt_size_t sector_offset;
6161
rt_size_t remain_size = size;
6262
rt_size_t req_size;
63-
rt_align(4) uint8_t buffer[SECTOR_SIZE];
63+
rt_align(4) rt_uint8_t buffer[SECTOR_SIZE];
6464

6565
while (remain_size)
6666
{
@@ -79,7 +79,7 @@ static int write(long offset, const uint8_t *buf, size_t size)
7979
return size;
8080
}
8181

82-
static int erase(long offset, size_t size)
82+
static int erase(long offset, rt_size_t size)
8383
{
8484
return size;
8585
}
@@ -93,7 +93,7 @@ static int init(void)
9393
}
9494
rt_device_open(sd_dev, RT_DEVICE_OFLAG_RDWR);
9595
struct dev_sdmmc *dev_sdmmc = (struct dev_sdmmc *)sd_dev->user_data;
96-
sd_card.len = (size_t)dev_sdmmc->geometry.bytes_per_sector * dev_sdmmc->geometry.sector_count;
96+
sd_card.len = (rt_size_t)dev_sdmmc->geometry.bytes_per_sector * dev_sdmmc->geometry.sector_count;
9797
sd_card.blk_size = dev_sdmmc->geometry.bytes_per_sector;
9898

9999
return 0;

Diff for: ‎bsp/hc32/ev_hc32f448_lqfp80/board/ports/fal/fal_flash_sfud_port.c

+12-12
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
#endif
2222

2323
static int init(void);
24-
static int read(long offset, uint8_t *buf, size_t size);
25-
static int write(long offset, const uint8_t *buf, size_t size);
26-
static int erase(long offset, size_t size);
24+
static int read(long offset, rt_uint8_t *buf, rt_size_t size);
25+
static int write(long offset, const rt_uint8_t *buf, rt_size_t size);
26+
static int erase(long offset, rt_size_t size);
2727

2828
static sfud_flash_t sfud_dev = NULL;
2929
struct fal_flash_dev ext_nor_flash0 =
@@ -51,19 +51,19 @@ static int init(void)
5151
return 0;
5252
}
5353

54-
static int read(long offset, uint8_t *buf, size_t size)
54+
static int read(long offset, rt_uint8_t *buf, rt_size_t size)
5555
{
56-
assert(sfud_dev);
57-
assert(sfud_dev->init_ok);
56+
RT_ASSERT(sfud_dev);
57+
RT_ASSERT(sfud_dev->init_ok);
5858
sfud_read(sfud_dev, ext_nor_flash0.addr + offset, size, buf);
5959

6060
return size;
6161
}
6262

63-
static int write(long offset, const uint8_t *buf, size_t size)
63+
static int write(long offset, const rt_uint8_t *buf, rt_size_t size)
6464
{
65-
assert(sfud_dev);
66-
assert(sfud_dev->init_ok);
65+
RT_ASSERT(sfud_dev);
66+
RT_ASSERT(sfud_dev->init_ok);
6767
if (sfud_write(sfud_dev, ext_nor_flash0.addr + offset, size, buf) != SFUD_SUCCESS)
6868
{
6969
return -1;
@@ -72,10 +72,10 @@ static int write(long offset, const uint8_t *buf, size_t size)
7272
return size;
7373
}
7474

75-
static int erase(long offset, size_t size)
75+
static int erase(long offset, rt_size_t size)
7676
{
77-
assert(sfud_dev);
78-
assert(sfud_dev->init_ok);
77+
RT_ASSERT(sfud_dev);
78+
RT_ASSERT(sfud_dev->init_ok);
7979
if (sfud_erase(sfud_dev, ext_nor_flash0.addr + offset, size) != SFUD_SUCCESS)
8080
{
8181
return -1;

Diff for: ‎bsp/hc32/ev_hc32f460_lqfp100_v2/board/ports/fal/fal_flash_sfud_port.c

+12-12
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#endif
2121

2222
static int init(void);
23-
static int read(long offset, uint8_t *buf, size_t size);
24-
static int write(long offset, const uint8_t *buf, size_t size);
25-
static int erase(long offset, size_t size);
23+
static int read(long offset, rt_uint8_t *buf, rt_size_t size);
24+
static int write(long offset, const rt_uint8_t *buf, rt_size_t size);
25+
static int erase(long offset, rt_size_t size);
2626

2727
static sfud_flash_t sfud_dev = NULL;
2828
struct fal_flash_dev ext_nor_flash0 =
@@ -50,19 +50,19 @@ static int init(void)
5050
return 0;
5151
}
5252

53-
static int read(long offset, uint8_t *buf, size_t size)
53+
static int read(long offset, rt_uint8_t *buf, rt_size_t size)
5454
{
55-
assert(sfud_dev);
56-
assert(sfud_dev->init_ok);
55+
RT_ASSERT(sfud_dev);
56+
RT_ASSERT(sfud_dev->init_ok);
5757
sfud_read(sfud_dev, ext_nor_flash0.addr + offset, size, buf);
5858

5959
return size;
6060
}
6161

62-
static int write(long offset, const uint8_t *buf, size_t size)
62+
static int write(long offset, const rt_uint8_t *buf, rt_size_t size)
6363
{
64-
assert(sfud_dev);
65-
assert(sfud_dev->init_ok);
64+
RT_ASSERT(sfud_dev);
65+
RT_ASSERT(sfud_dev->init_ok);
6666
if (sfud_write(sfud_dev, ext_nor_flash0.addr + offset, size, buf) != SFUD_SUCCESS)
6767
{
6868
return -1;
@@ -71,10 +71,10 @@ static int write(long offset, const uint8_t *buf, size_t size)
7171
return size;
7272
}
7373

74-
static int erase(long offset, size_t size)
74+
static int erase(long offset, rt_size_t size)
7575
{
76-
assert(sfud_dev);
77-
assert(sfud_dev->init_ok);
76+
RT_ASSERT(sfud_dev);
77+
RT_ASSERT(sfud_dev->init_ok);
7878
if (sfud_erase(sfud_dev, ext_nor_flash0.addr + offset, size) != SFUD_SUCCESS)
7979
{
8080
return -1;

Diff for: ‎bsp/hc32/ev_hc32f4a0_lqfp176/board/ports/fal/fal_flash_sfud_port.c

+12-12
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#endif
2121

2222
static int init(void);
23-
static int read(long offset, uint8_t *buf, size_t size);
24-
static int write(long offset, const uint8_t *buf, size_t size);
25-
static int erase(long offset, size_t size);
23+
static int read(long offset, rt_uint8_t *buf, rt_size_t size);
24+
static int write(long offset, const rt_uint8_t *buf, rt_size_t size);
25+
static int erase(long offset, rt_size_t size);
2626

2727
static sfud_flash_t sfud_dev = NULL;
2828
struct fal_flash_dev ext_nor_flash0 =
@@ -50,19 +50,19 @@ static int init(void)
5050
return 0;
5151
}
5252

53-
static int read(long offset, uint8_t *buf, size_t size)
53+
static int read(long offset, rt_uint8_t *buf, rt_size_t size)
5454
{
55-
assert(sfud_dev);
56-
assert(sfud_dev->init_ok);
55+
RT_ASSERT(sfud_dev);
56+
RT_ASSERT(sfud_dev->init_ok);
5757
sfud_read(sfud_dev, ext_nor_flash0.addr + offset, size, buf);
5858

5959
return size;
6060
}
6161

62-
static int write(long offset, const uint8_t *buf, size_t size)
62+
static int write(long offset, const rt_uint8_t *buf, rt_size_t size)
6363
{
64-
assert(sfud_dev);
65-
assert(sfud_dev->init_ok);
64+
RT_ASSERT(sfud_dev);
65+
RT_ASSERT(sfud_dev->init_ok);
6666
if (sfud_write(sfud_dev, ext_nor_flash0.addr + offset, size, buf) != SFUD_SUCCESS)
6767
{
6868
return -1;
@@ -71,10 +71,10 @@ static int write(long offset, const uint8_t *buf, size_t size)
7171
return size;
7272
}
7373

74-
static int erase(long offset, size_t size)
74+
static int erase(long offset, rt_size_t size)
7575
{
76-
assert(sfud_dev);
77-
assert(sfud_dev->init_ok);
76+
RT_ASSERT(sfud_dev);
77+
RT_ASSERT(sfud_dev->init_ok);
7878
if (sfud_erase(sfud_dev, ext_nor_flash0.addr + offset, size) != SFUD_SUCCESS)
7979
{
8080
return -1;

Diff for: ‎bsp/hc32/lckfb-hc32f4a0-lqfp100/board/ports/fal/fal_flash_sfud_port.c

+12-12
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#endif
2121

2222
static int init(void);
23-
static int read(long offset, uint8_t *buf, size_t size);
24-
static int write(long offset, const uint8_t *buf, size_t size);
25-
static int erase(long offset, size_t size);
23+
static int read(long offset, rt_uint8_t *buf, rt_size_t size);
24+
static int write(long offset, const rt_uint8_t *buf, rt_size_t size);
25+
static int erase(long offset, rt_size_t size);
2626

2727
static sfud_flash_t sfud_dev = NULL;
2828
struct fal_flash_dev ext_nor_flash0 =
@@ -50,19 +50,19 @@ static int init(void)
5050
return 0;
5151
}
5252

53-
static int read(long offset, uint8_t *buf, size_t size)
53+
static int read(long offset, rt_uint8_t *buf, rt_size_t size)
5454
{
55-
assert(sfud_dev);
56-
assert(sfud_dev->init_ok);
55+
RT_ASSERT(sfud_dev);
56+
RT_ASSERT(sfud_dev->init_ok);
5757
sfud_read(sfud_dev, ext_nor_flash0.addr + offset, size, buf);
5858

5959
return size;
6060
}
6161

62-
static int write(long offset, const uint8_t *buf, size_t size)
62+
static int write(long offset, const rt_uint8_t *buf, rt_size_t size)
6363
{
64-
assert(sfud_dev);
65-
assert(sfud_dev->init_ok);
64+
RT_ASSERT(sfud_dev);
65+
RT_ASSERT(sfud_dev->init_ok);
6666
if (sfud_write(sfud_dev, ext_nor_flash0.addr + offset, size, buf) != SFUD_SUCCESS)
6767
{
6868
return -1;
@@ -71,10 +71,10 @@ static int write(long offset, const uint8_t *buf, size_t size)
7171
return size;
7272
}
7373

74-
static int erase(long offset, size_t size)
74+
static int erase(long offset, rt_size_t size)
7575
{
76-
assert(sfud_dev);
77-
assert(sfud_dev->init_ok);
76+
RT_ASSERT(sfud_dev);
77+
RT_ASSERT(sfud_dev->init_ok);
7878
if (sfud_erase(sfud_dev, ext_nor_flash0.addr + offset, size) != SFUD_SUCCESS)
7979
{
8080
return -1;

Diff for: ‎bsp/hc32/platform/fal/fal_flash_sfud_nor.c

+12-12
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525

2626

2727
static int init(void);
28-
static int read(long offset, uint8_t *buf, size_t size);
29-
static int write(long offset, const uint8_t *buf, size_t size);
30-
static int erase(long offset, size_t size);
28+
static int read(long offset, rt_uint8_t *buf, rt_size_t size);
29+
static int write(long offset, const rt_uint8_t *buf, rt_size_t size);
30+
static int erase(long offset, rt_size_t size);
3131

3232

3333
static sfud_flash_t sfud_dev = NULL;
@@ -57,19 +57,19 @@ static int init(void)
5757
return 0;
5858
}
5959

60-
static int read(long offset, uint8_t *buf, size_t size)
60+
static int read(long offset, rt_uint8_t *buf, rt_size_t size)
6161
{
62-
assert(sfud_dev);
63-
assert(sfud_dev->init_ok);
62+
RT_ASSERT(sfud_dev);
63+
RT_ASSERT(sfud_dev->init_ok);
6464
sfud_read(sfud_dev, ext_nor_flash0.addr + offset, size, buf);
6565

6666
return size;
6767
}
6868

69-
static int write(long offset, const uint8_t *buf, size_t size)
69+
static int write(long offset, const rt_uint8_t *buf, rt_size_t size)
7070
{
71-
assert(sfud_dev);
72-
assert(sfud_dev->init_ok);
71+
RT_ASSERT(sfud_dev);
72+
RT_ASSERT(sfud_dev->init_ok);
7373
if (sfud_write(sfud_dev, ext_nor_flash0.addr + offset, size, buf) != SFUD_SUCCESS)
7474
{
7575
return -1;
@@ -78,10 +78,10 @@ static int write(long offset, const uint8_t *buf, size_t size)
7878
return size;
7979
}
8080

81-
static int erase(long offset, size_t size)
81+
static int erase(long offset, rt_size_t size)
8282
{
83-
assert(sfud_dev);
84-
assert(sfud_dev->init_ok);
83+
RT_ASSERT(sfud_dev);
84+
RT_ASSERT(sfud_dev->init_ok);
8585
if (sfud_erase(sfud_dev, ext_nor_flash0.addr + offset, size) != SFUD_SUCCESS)
8686
{
8787
return -1;

0 commit comments

Comments
 (0)