Browse Source

modify code style

Han Xinrong 4 years ago
parent
commit
db4b3ff125

+ 5 - 2
bsp/nrf5x/libraries/templates/nrf52x/applications/ble_nus_app.c

@@ -603,10 +603,13 @@ static void _stack_thread(void *parameter)
 
 
         result = rt_event_recv(stack_event, STACK_EV_DISCON | STACK_EV_DISPATCH | STACK_EV_KEY,
         result = rt_event_recv(stack_event, STACK_EV_DISCON | STACK_EV_DISPATCH | STACK_EV_KEY,
                     RT_EVENT_FLAG_OR | RT_EVENT_FLAG_CLEAR, next_timeout, &event);
                     RT_EVENT_FLAG_OR | RT_EVENT_FLAG_CLEAR, next_timeout, &event);
-        if (result == -RT_ETIMEOUT) {
+        if (result == -RT_ETIMEOUT) 
+        {
             LOG_E("wait completed timeout");
             LOG_E("wait completed timeout");
             continue;
             continue;
-        }else if (result == -RT_ERROR) {
+        }
+        else if (result == -RT_ERROR) 
+        {
             LOG_E("event received error");
             LOG_E("event received error");
             continue;
             continue;
         }
         }

+ 16 - 10
components/dfs/filesystems/jffs2/src/gcthread.c

@@ -187,7 +187,7 @@ jffs2_stop_garbage_collect_thread(struct jffs2_sb_info *c)
 {
 {
      struct super_block *sb=OFNI_BS_2SFFJ(c);
      struct super_block *sb=OFNI_BS_2SFFJ(c);
      cyg_mtab_entry *mte;
      cyg_mtab_entry *mte;
-	   rt_uint32_t  e;
+     rt_uint32_t  e;
      rt_err_t result;
      rt_err_t result;
 	 
 	 
      //RT_ASSERT(sb->s_gc_thread_handle);
      //RT_ASSERT(sb->s_gc_thread_handle);
@@ -203,13 +203,16 @@ jffs2_stop_garbage_collect_thread(struct jffs2_sb_info *c)
                    GC_THREAD_FLAG_HAS_EXIT,
                    GC_THREAD_FLAG_HAS_EXIT,
                    RT_EVENT_FLAG_OR | RT_EVENT_FLAG_CLEAR,
                    RT_EVENT_FLAG_OR | RT_EVENT_FLAG_CLEAR,
 				   RT_WAITING_FOREVER,  &e);
 				   RT_WAITING_FOREVER,  &e);
-     if (result == -RT_ETIMEOUT) {
-            LOG_E("wait completed timeout");
-            return;
-        }else if (result == -RT_ERROR) {
-            LOG_E("event received error");
-            return;
-        }
+     if (result == -RT_ETIMEOUT) 
+     {
+       LOG_E("wait completed timeout");
+       return;
+     }
+     else if (result == -RT_ERROR)
+     {
+       LOG_E("event received error");
+       return;
+     }
 
 
      // Kill and free the resources ...  this is safe due to the flag
      // Kill and free the resources ...  this is safe due to the flag
      // from the thread.
      // from the thread.
@@ -236,10 +239,13 @@ jffs2_garbage_collect_thread(unsigned long data)
                         RT_EVENT_FLAG_OR | RT_EVENT_FLAG_CLEAR,
                         RT_EVENT_FLAG_OR | RT_EVENT_FLAG_CLEAR,
 				        cyg_current_time() + CYGNUM_JFFS2_GS_THREAD_TICKS,  
 				        cyg_current_time() + CYGNUM_JFFS2_GS_THREAD_TICKS,  
 						&flag);
 						&flag);
-          if (result == -RT_ETIMEOUT) {
+          if (result == -RT_ETIMEOUT) 
+          {
             LOG_E("wait completed timeout");
             LOG_E("wait completed timeout");
             continue;
             continue;
-          }else if (result == -RT_ERROR) {
+          }
+          else if (result == -RT_ERROR) 
+          {
             LOG_E("event received error");
             LOG_E("event received error");
             continue;
             continue;
           }
           }