Skip to content

Commit afed3bd

Browse files
committed
Terminology: Replace potentially offensive terms in documentation
In line with the terminology changes proposed by the OpenAMP Technical Steering committee. Suppress "master and "slave" terms in comments and documentations. Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
1 parent ef7a9d0 commit afed3bd

44 files changed

Lines changed: 137 additions & 137 deletions

Some content is hidden

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

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ enable development of software applications for Asymmetric Multiprocessing
1111
environments
1212
3. Compatibility with upstream Linux remoteproc and rpmsg components
1313
4. Following AMP configurations supported
14-
a. Linux master/Generic(Baremetal) remote
15-
b. Generic(Baremetal) master/Linux remote
16-
5. Proxy infrastructure and supplied demos showcase ability of proxy on master
14+
a. Linux host/Generic(Baremetal) remote
15+
b. Generic(Baremetal) host/Linux remote
16+
5. Proxy infrastructure and supplied demos showcase ability of proxy on host
1717
to handle printf, scanf, open, close, read, write calls from Bare metal
1818
based remote contexts.
1919

@@ -96,7 +96,7 @@ library for it project:
9696
enabled on buffers.
9797
* **RPMSG_BUFFER_SIZE** (default 512): adjust the size of the RPMsg buffers.
9898
The default value of the RPMsg size is compatible with the Linux Kernel hard
99-
coded value. If you AMP configuration is Linux kernel master/ OpenAMP remote,
99+
coded value. If you AMP configuration is Linux kernel host/ OpenAMP remote,
100100
this option must not be used.
101101

102102
### Example to compile OpenAMP for Zephyr
@@ -264,11 +264,11 @@ The OpenAMP version follows the set of rule proposed in [Semantic Versioning spe
264264
265265
## Supported System and Machines
266266
For now, it supports:
267-
* Zynq generic slave
268-
* Zynq UltraScale+ MPSoC R5 generic slave
267+
* Zynq generic remote
268+
* Zynq UltraScale+ MPSoC R5 generic remote
269269
* Linux host OpenAMP between Linux userspace processes
270-
* Linux userspace OpenAMP RPMsg master
271-
* Linux userspace OpenAMP RPMsg slave
270+
* Linux userspace OpenAMP RPMsg host
271+
* Linux userspace OpenAMP RPMsg remote
272272
* Linux userspace OpenAMP RPMsg and MicroBlaze bare metal remote
273273
274274
## Known Limitations:

apps/examples/echo/rpmsg-echo.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/*
66
* This is a sample demonstration application that showcases usage of rpmsg
77
* This application is meant to run on the remote CPU running baremetal code.
8-
* This application echoes back data that was sent to it by the master core.
8+
* This application echoes back data that was sent to it by the host core.
99
*/
1010

1111
#include <stdio.h>
@@ -41,7 +41,7 @@ static int rpmsg_endpoint_cb(struct rpmsg_endpoint *ept, void *data, size_t len,
4141
return RPMSG_SUCCESS;
4242
}
4343

44-
/* Send data back to master */
44+
/* Send data back to host */
4545
if (rpmsg_send(ept, data, len) < 0) {
4646
LPERROR("rpmsg_send failed\r\n");
4747
}

apps/examples/echo/rpmsg-ping.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/*
66
* This is a sample demonstration application that showcases usage of rpmsg
77
* This application is meant to run on the remote CPU running baremetal code.
8-
* This application echoes back data that was sent to it by the master core.
8+
* This application echoes back data that was sent to it by the host core.
99
*/
1010

1111
#include <stdio.h>

apps/examples/linux_rpc_demo/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# linux_rpc_demo
22
This readme is about the OpenAMP linux_rpc_demo.
33

4-
The linux_rpc_demo is about remote procedure calls between linux master and linux
5-
slave using rpmsg to perform
4+
The linux_rpc_demo is about remote procedure calls between linux host and linux
5+
remote using rpmsg to perform
66
1. File operations such as open, read, write and close
77
2. I/O operation such as printf, scanf
88

@@ -51,7 +51,7 @@ generated to `build/usr/local/bin` directory.
5151
$ sudo LD_LIBRARY_PATH=<openamp_built>/usr/local/lib:<libmetal_built>/usr/local/lib \
5252
build-openamp/usr/local/bin/linux_rpc_demo-shared 1
5353
```
54-
Enter the inputs on the master side the same gets printed on the remote side. You will see communication between the master and remote process using rpmsg calls.
54+
Enter the inputs on the host side the same gets printed on the remote side. You will see communication between the host and remote process using rpmsg calls.
5555
5656
## Note:
5757
`sudo` is required to run the OpenAMP demos between Linux processes, as it doesn't work on

apps/examples/linux_rpc_demo/linux_rpc_demo.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/*This is a sample demonstration application that showcases usage of proxy
99
*from the remote core.
1010
*This application is meant to run on the remote CPU running linux.
11-
*This application can print to the master console and perform file I/O through
11+
*This application can print to the host console and perform file I/O through
1212
*rpmsg channels.
1313
*/
1414

@@ -482,10 +482,10 @@ int app(struct rpmsg_device *rdev, void *priv)
482482

483483
printf("\nRemote>Rpmsg based retargetting to proxy initialized..\r\n");
484484

485-
/* Remote performing file IO on Master */
485+
/* Remote performing file IO on Host */
486486
printf("\nRemote>FileIO demo ..\r\n");
487487

488-
printf("\nRemote>Creating a file on master and writing to it..\r\n");
488+
printf("\nRemote>Creating a file on host and writing to it..\r\n");
489489
rpmsg_open(fname, REDEF_O_CREAT | REDEF_O_WRONLY | REDEF_O_APPEND,
490490
S_IRUSR | S_IWUSR);
491491
printf("\nRemote>Opened file '%s' with fd = %d\r\n", fname, fd);
@@ -496,8 +496,8 @@ int app(struct rpmsg_device *rdev, void *priv)
496496
rpmsg_close(fd);
497497
printf("\nRemote>Closed fd = %d\r\n", fd);
498498

499-
/* Remote performing file IO on Master */
500-
printf("\nRemote>Reading a file on master and displaying its "
499+
/* Remote performing file IO on Host */
500+
printf("\nRemote>Reading a file on host and displaying its "
501501
"contents..\r\n");
502502
rpmsg_open(fname, REDEF_O_RDONLY, S_IRUSR | S_IWUSR);
503503
printf("\nRemote>Opened file '%s' with fd = %d\r\n", fname, fd);
@@ -509,10 +509,10 @@ int app(struct rpmsg_device *rdev, void *priv)
509509
printf("\nRemote>Closed fd = %d\r\n", fd);
510510

511511
while (1) {
512-
/* Remote performing STDIO on Master */
512+
/* Remote performing STDIO on Host */
513513
printf("\nRemote>Remote firmware using scanf and printf .."
514514
"\r\n");
515-
printf("\nRemote>Scanning user input from master..\r\n");
515+
printf("\nRemote>Scanning user input from host..\r\n");
516516
printf("\nRemote>Enter name\r\n");
517517
rpmsg_input(ubuff, sizeof(ubuff));
518518
ret = bytes_read;

apps/examples/linux_rpc_demo/linux_rpc_demod.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/*This is a sample demonstration application that showcases usage of proxy
99
*from the remote core.
1010
*This application is meant to run on the remote CPU running linux.
11-
*This application can print to the master console and perform file I/O through
11+
*This application can print to the host console and perform file I/O through
1212
*rpmsg channels.
1313
*/
1414

@@ -32,7 +32,7 @@
3232
#define REDEF_O_ACCMODE 3
3333

3434
#define raw_printf(format, ...) printf(format, ##__VA_ARGS__)
35-
#define LPRINTF(format, ...) raw_printf("Master> " format, ##__VA_ARGS__)
35+
#define LPRINTF(format, ...) raw_printf("Host> " format, ##__VA_ARGS__)
3636
#define LPERROR(format, ...) LPRINTF("ERROR: " format, ##__VA_ARGS__)
3737

3838
static void *platform;

apps/examples/matrix_multiply/matrix_multiply.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
/*
66
* This is a sample demonstration application that showcases usage of remoteproc
77
* and rpmsg APIs on the remote core. This application is meant to run on the remote CPU
8-
* running baremetal code. This applicationr receives two matrices from the master,
9-
* multiplies them and returns the result to the master core.
8+
* running baremetal code. This applicationr receives two matrices from the host,
9+
* multiplies them and returns the result to the host core.
1010
*/
1111

1212
#include <stdio.h>

apps/examples/matrix_multiply/matrix_multiplyd.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
/*
66
* This is a sample demonstration application that showcases usage of remoteproc
77
* and rpmsg APIs on the remote core. This application is meant to run on the remote CPU
8-
* running baremetal code. This applicationr receives two matrices from the master,
9-
* multiplies them and returns the result to the master core.
8+
* running baremetal code. This applicationr receives two matrices from the host,
9+
* multiplies them and returns the result to the host core.
1010
*/
1111

1212
#include <stdio.h>
@@ -76,7 +76,7 @@ static int rpmsg_endpoint_cb(struct rpmsg_endpoint *ept, void *data, size_t len,
7676
/* Process received data and multiple matrices. */
7777
Matrix_Multiply(&matrix_array[0], &matrix_array[1], &matrix_result);
7878

79-
/* Send the result of matrix multiplication back to master. */
79+
/* Send the result of matrix multiplication back to host. */
8080
if (rpmsg_send(ept, &matrix_result, sizeof(matrix)) < 0) {
8181
LPERROR("rpmsg_send failed\r\n");
8282
}

apps/examples/nocopy_echo/rpmsg-nocopy-echo.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/*
88
* This is a sample demonstration application that showcases usage of rpmsg
99
* This application is meant to run on the remote CPU running baremetal code.
10-
* This application echoes back data that was sent to it by the master core.
10+
* This application echoes back data that was sent to it by the host core.
1111
*/
1212

1313
#include <stdio.h>
@@ -111,7 +111,7 @@ int app(struct rpmsg_device *rdev, void *priv)
111111
break;
112112
}
113113
while (rpmsg_list) {
114-
/* Send data back to master */
114+
/* Send data back to host */
115115
ret = rpmsg_send(rpmsg_list->ept, rpmsg_list->data,
116116
rpmsg_list->len);
117117
if (ret < 0) {

apps/examples/rpc_demo/rpc_demo.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/*
66
* This is a sample demonstration application that showcases usage of proxy from the remote core.
77
* This application is meant to run on the remote CPU running baremetal.
8-
* This application can print to the master console and perform file I/O using proxy mechanism.
8+
* This application can print to the host console and perform file I/O using proxy mechanism.
99
*/
1010

1111
#include <stdio.h>
@@ -69,10 +69,10 @@ int app(struct rpmsg_device *rdev, void *priv)
6969

7070
printf("\nRemote>Rpmsg based retargetting to proxy initialized..\r\n");
7171

72-
/* Remote performing file IO on Master */
72+
/* Remote performing file IO on Host */
7373
printf("\nRemote>FileIO demo ..\r\n");
7474

75-
printf("\nRemote>Creating a file on master and writing to it..\r\n");
75+
printf("\nRemote>Creating a file on host and writing to it..\r\n");
7676
fd = open(fname, REDEF_O_CREAT | REDEF_O_WRONLY | REDEF_O_APPEND,
7777
S_IRUSR | S_IWUSR);
7878
printf("\nRemote>Opened file '%s' with fd = %d\r\n", fname, fd);
@@ -84,8 +84,8 @@ int app(struct rpmsg_device *rdev, void *priv)
8484
close(fd);
8585
printf("\nRemote>Closed fd = %d\r\n", fd);
8686

87-
/* Remote performing file IO on Master */
88-
printf("\nRemote>Reading a file on master and displaying its contents..\r\n");
87+
/* Remote performing file IO on Host */
88+
printf("\nRemote>Reading a file on host and displaying its contents..\r\n");
8989
fd = open(fname, REDEF_O_RDONLY, S_IRUSR | S_IWUSR);
9090
printf("\nRemote>Opened file '%s' with fd = %d\r\n", fname, fd);
9191
bytes_read = read(fd, rbuff, 1024);
@@ -96,9 +96,9 @@ int app(struct rpmsg_device *rdev, void *priv)
9696
printf("\nRemote>Closed fd = %d\r\n", fd);
9797

9898
while (1) {
99-
/* Remote performing STDIO on Master */
99+
/* Remote performing STDIO on Host */
100100
printf("\nRemote>Remote firmware using scanf and printf ..\r\n");
101-
printf("\nRemote>Scanning user input from master..\r\n");
101+
printf("\nRemote>Scanning user input from host..\r\n");
102102
printf("\nRemote>Enter name\r\n");
103103
ret = scanf("%s", ubuff);
104104
if (ret) {

0 commit comments

Comments
 (0)