Skip to content

Commit 7f6e60d

Browse files
committed
rtapi_realtime_type -> rtapi_get_realtime_type
1 parent 1ac53d8 commit 7f6e60d

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/hal/hal_lib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3121,7 +3121,7 @@ int rtapi_app_main(void)
31213121
rtapi_print_msg(RTAPI_MSG_DBG,
31223122
"HAL_LIB: kernel lib installed successfully\n");
31233123

3124-
hal_data->realtime_type = rtapi_realtime_type();
3124+
hal_data->realtime_type = rtapi_get_realtime_type();
31253125

31263126
return 0;
31273127
}

src/rtapi/rtai_rtapi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1689,7 +1689,7 @@ unsigned char rtapi_inb(unsigned int port)
16891689
}
16901690

16911691
int rtapi_is_realtime(void) { return 1; }
1692-
rtapi_realtime_type_t rtapi_realtime_type(void){ return REALTIME_TYPE_RTAI; }
1692+
rtapi_realtime_type_t rtapi_get_realtime_type(void){ return REALTIME_TYPE_RTAI; }
16931693
int rtapi_is_kernelspace(void) { return 1; }
16941694

16951695
/* starting with kernel 2.6, symbols that are used by other modules
@@ -1747,5 +1747,5 @@ EXPORT_SYMBOL(rtapi_disable_interrupt);
17471747
EXPORT_SYMBOL(rtapi_outb);
17481748
EXPORT_SYMBOL(rtapi_inb);
17491749
EXPORT_SYMBOL(rtapi_is_realtime);
1750-
EXPORT_SYMBOL(rtapi_realtime_type);
1750+
EXPORT_SYMBOL(rtapi_get_realtime_type);
17511751
EXPORT_SYMBOL(rtapi_is_kernelspace);

src/rtapi/rtapi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1001,7 +1001,7 @@ typedef enum{
10011001
//Only available in real time context
10021002
//In userspace context, use hal_realtime_type()
10031003
extern int rtapi_is_realtime(void);
1004-
extern rtapi_realtime_type_t rtapi_realtime_type(void);
1004+
extern rtapi_realtime_type_t rtapi_get_realtime_type(void);
10051005
#endif
10061006

10071007
int rtapi_open_as_root(const char *filename, int mode);

src/rtapi/uspace_rtapi_main.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ static int can_set_sched_fifo(void) {
221221
return 1;
222222
}
223223

224-
rtapi_realtime_type_t rtapi_realtime_type(void){
224+
rtapi_realtime_type_t rtapi_get_realtime_type(void){
225225
static rtapi_realtime_type_t cached = REALTIME_TYPE_UNINITIALIZED;
226226
if(cached != REALTIME_TYPE_UNINITIALIZED){
227227
return cached;
@@ -253,7 +253,7 @@ rtapi_realtime_type_t rtapi_realtime_type(void){
253253
return cached;
254254
}
255255

256-
rtapi_print_msg(RTAPI_MSG_ERR, "rtapi_realtime_type(): Bug, something unknown is running\n");
256+
rtapi_print_msg(RTAPI_MSG_ERR, "rtapi_get_realtime_type(): Bug, something unknown is running\n");
257257
cached = REALTIME_TYPE_PREEMPT_DYNAMIC;
258258
return cached;
259259
}
@@ -266,7 +266,7 @@ rtapi_realtime_type_t rtapi_realtime_type(void){
266266
// wrapper-based installs like NixOS /run/wrappers) and silently masked
267267
// LINUXCNC_FORCE_REALTIME (see issue #3928).
268268
int rtapi_is_realtime() {
269-
return rtapi_realtime_type() > 0;
269+
return rtapi_get_realtime_type() > 0;
270270
}
271271

272272
struct message_t {
@@ -1263,7 +1263,7 @@ static void raise_net_admin_ambient(void) {
12631263

12641264
static RtapiApp *makeApp() {
12651265
RtapiApp *app;
1266-
rtapi_realtime_type_t rt_type = rtapi_realtime_type();
1266+
rtapi_realtime_type_t rt_type = rtapi_get_realtime_type();
12671267
if (rt_type == REALTIME_TYPE_NONE) {
12681268
app = makeDllApp("liblinuxcnc-uspace-posix.so.0", SCHED_OTHER);
12691269
} else {

0 commit comments

Comments
 (0)