Skip to content

Commit 75e2e04

Browse files
fdesbiensfdesbiens
authored
Merge pull request #144 from parsley/fix_mutex
Replaced _gx_system_lock and _gx_system_unlock with defines
2 parents 329c1f7 + a521e2e commit 75e2e04

12 files changed

Lines changed: 28 additions & 27 deletions

‎common/src/gx_horizontal_list_total_columns_set.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
/* */
5656
/* CALLS */
5757
/* */
58-
/* _gx_system_lock Obtain GUIX system lock */
59-
/* _gx_system_unlock Release GUIX system lock */
58+
/* GX_ENTER_CRITICAL Obtain GUIX system lock */
59+
/* GX_EXIT_CRITICAL Release GUIX system lock */
6060
/* _gx_first_client_child_get Get the first client child */
6161
/* _gx_window_scrollbar_find Find the scrollbar */
6262
/* _gx_scrollbar_reset Reset the schollbar */
@@ -85,7 +85,7 @@ INT index;
8585
GX_WIDGET *test;
8686
GX_SCROLLBAR *pScroll;
8787

88-
_gx_system_lock();
88+
GX_ENTER_CRITICAL
8989

9090
/* Update total count of rows. */
9191
list -> gx_horizontal_list_total_columns = count;
@@ -183,7 +183,7 @@ GX_SCROLLBAR *pScroll;
183183
_gx_scrollbar_reset(pScroll, GX_NULL);
184184
}
185185

186-
_gx_system_unlock();
186+
GX_EXIT_CRITICAL
187187

188188
/* Refresh screen. */
189189
if (list -> gx_widget_status & GX_STATUS_VISIBLE)

‎common/src/gx_system_animation_free.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
/* */
5353
/* CALLS */
5454
/* */
55-
/* _gx_system_lock lock system mutex */
56-
/* _gx_system_unlock unlock system mutex */
55+
/* GX_ENTER_CRITICAL lock system mutex */
56+
/* GX_EXIT_CRITICAL unlock system mutex */
5757
/* */
5858
/* CALLED BY */
5959
/* */

‎common/src/gx_system_animation_get.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
/* */
5353
/* CALLS */
5454
/* */
55-
/* _gx_system_lock lock system mutex */
56-
/* _gx_system_unlock unlock system mutex */
55+
/* GX_ENTER_CRITICAL lock system mutex */
56+
/* GX_EXIT_CRITICAL unlock system mutex */
5757
/* */
5858
/* CALLED BY */
5959
/* */

‎common/src/gx_system_timer_start.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
/* CALLS */
5757
/* */
5858
/* tx_timer_activate start the ThreadX timer */
59-
/* _gx_system_lock lock system mutex */
60-
/* _gx_system_unlock unlock system mutex */
59+
/* GX_ENTER_CRITICAL lock system mutex */
60+
/* GX_EXIT_CRITICAL unlock system mutex */
6161
/* */
6262
/* CALLED BY */
6363
/* */

‎common/src/gx_system_timer_stop.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
/* */
5454
/* CALLS */
5555
/* */
56-
/* _gx_system_lock lock critical section */
57-
/* _gx_system_unlock unlock critical section */
56+
/* GX_ENTER_CRITICAL lock critical section */
57+
/* GX_EXIT_CRITICAL unlock critical section */
5858
/* tx_timer_deactivate stop the ThreadX timer */
5959
/* */
6060
/* CALLED BY */

‎common/src/gx_system_timer_update.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
/* */
5555
/* CALLS */
5656
/* */
57-
/* _gx_system_lock Lock system mutex */
58-
/* _gx_system_unlock Unlock system mutex */
57+
/* GX_ENTER_CRITICAL Lock system mutex */
58+
/* GX_EXIT_CRITICAL Unlock system mutex */
5959
/* [gx_widget_event_process_function] Event handler of timer owner */
6060
/* _gx_system_timer_stop Stop the system timer */
6161
/* _gx_animation_update Update the animation sequence */

‎common/src/gx_vertical_list_total_rows_set.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
/* */
5656
/* CALLS */
5757
/* */
58-
/* _gx_system_lock Obtain GUIX system lock */
59-
/* _gx_system_unlock Release GUIX system lock */
58+
/* GX_ENTER_CRITICAL Obtain GUIX system lock */
59+
/* GX_EXIT_CRITICAL Release GUIX system lock */
6060
/* _gx_first_client_child_get Get the first client child */
6161
/* [gx_vertical_list_callback] Vertical list callback */
6262
/* _gx_window_scrollbar_find Find the scrollbar */
@@ -86,7 +86,7 @@ INT index;
8686
GX_WIDGET *test;
8787
GX_SCROLLBAR *pScroll;
8888

89-
_gx_system_lock();
89+
GX_ENTER_CRITICAL
9090

9191
/* Update total count of rows. */
9292
list -> gx_vertical_list_total_rows = count;
@@ -183,7 +183,7 @@ GX_SCROLLBAR *pScroll;
183183
_gx_scrollbar_reset(pScroll, GX_NULL);
184184
}
185185

186-
_gx_system_unlock();
186+
GX_EXIT_CRITICAL
187187

188188
/* Refresh screen. */
189189
if (list -> gx_widget_status & GX_STATUS_VISIBLE)

‎common/src/gx_widget_attach.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@
5555
/* */
5656
/* CALLS */
5757
/* */
58-
/* _gx_system_lock Obtain GUIX system lock */
58+
/* GX_ENTER_CRITICAL Obtain GUIX system lock */
5959
/* _gx_widget_detach Detach from current parent */
6060
/* _gx_widget_link Link widget */
61-
/* _gx_system_unlock Release GUIX system lock */
61+
/* GX_EXIT_CRITICAL Release GUIX system lock */
6262
/* */
6363
/* CALLED BY */
6464
/* */

‎common/src/gx_widget_back_attach.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@
5555
/* */
5656
/* CALLS */
5757
/* */
58-
/* _gx_system_lock Obtain GUIX system lock */
58+
/* GX_ENTER_CRITICAL Obtain GUIX system lock */
5959
/* _gx_widget_detach Detach widget */
6060
/* _gx_widget_back_link Link widget in back */
61-
/* _gx_system_unlock Release GUIX system lock */
61+
/* GX_EXIT_CRITICAL Release GUIX system lock */
6262
/* */
6363
/* CALLED BY */
6464
/* */

‎common/src/gx_widget_create.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@
5959
/* */
6060
/* CALLS */
6161
/* */
62-
/* _gx_system_lock Lock access to GUIX */
62+
/* GX_ENTER_CRITICAL Lock access to GUIX */
6363
/* _gx_widget_link Link a widget to parent */
64-
/* _gx_system_unlock Release the protection */
64+
/* GX_EXIT_CRITICAL Release the protection */
6565
/* */
6666
/* CALLED BY */
6767
/* */

0 commit comments

Comments
 (0)