Changeset 1433ecda in mainline for uspace/drv/nic/rtl8139

Timestamp:

2018-04-04T15:42:37Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2c4e1cc

Parents:

47b2d7e3

Message:

Fix cstyle: make ccheck-fix and commit only files where all the changes are good.

Location:

uspace/drv/nic/rtl8139

Files:

• defs.c (modified) (2 diffs)
• general.c (modified) (3 diffs)

uspace/drv/nic/rtl8139/defs.c

@@ -29 +29 @@
 #include "defs.h"
 
-const char* model_names[RTL8139_VER_COUNT] = {
+const char *model_names[RTL8139_VER_COUNT] = {
         "RTL8139",
         "RTL8139A",
@@ -46 +46 @@
 
 const struct rtl8139_hwver_map rtl8139_versions[RTL8139_VER_COUNT + 1] = {
-        { HWVER(1,1,0,0,0,0,0), RTL8139 },
-        { HWVER(1,1,1,0,0,0,0), RTL8139A },
-        { HWVER(1,1,1,0,0,1,0), RTL8139A_G },
-        { HWVER(1,1,1,1,0,0,0), RTL8139B },
-        { HWVER(1,1,1,1,1,0,0), RTL8130 },
-        { HWVER(1,1,1,0,1,0,0), RTL8139C },
-        { HWVER(1,1,1,1,0,1,0), RTL8100 },
-        { HWVER(1,1,1,0,1,0,1), RTL8139D },
-        { HWVER(1,1,1,0,1,1,0), RTL8139Cp },
-        { HWVER(1,1,1,0,1,1,1), RTL8101 },
+        { HWVER(1, 1, 0, 0, 0, 0, 0), RTL8139 },
+        { HWVER(1, 1, 1, 0, 0, 0, 0), RTL8139A },
+        { HWVER(1, 1, 1, 0, 0, 1, 0), RTL8139A_G },
+        { HWVER(1, 1, 1, 1, 0, 0, 0), RTL8139B },
+        { HWVER(1, 1, 1, 1, 1, 0, 0), RTL8130 },
+        { HWVER(1, 1, 1, 0, 1, 0, 0), RTL8139C },
+        { HWVER(1, 1, 1, 1, 0, 1, 0), RTL8100 },
+        { HWVER(1, 1, 1, 0, 1, 0, 1), RTL8139D },
+        { HWVER(1, 1, 1, 0, 1, 1, 0), RTL8139Cp },
+        { HWVER(1, 1, 1, 0, 1, 1, 1), RTL8101 },
         /* End value */
-        { 0, RTL8139_VER_COUNT}
+        { 0, RTL8139_VER_COUNT }
 };
 

uspace/drv/nic/rtl8139/general.c

@@ -51 +51 @@
  * @return NULL if the error occures, dest if succeed
  */
-void* rtl8139_memcpy_wrapped(void *dest, const void *src, size_t src_offset,
+void *rtl8139_memcpy_wrapped(void *dest, const void *src, size_t src_offset,
     size_t src_size, size_t data_size)
 {
@@ -83 +83 @@
  *  @return EOK if succeed, error code otherwise
  */
-errno_t rtl8139_timer_act_init(rtl8139_timer_act_t * ta, uint32_t timer_freq,
+errno_t rtl8139_timer_act_init(rtl8139_timer_act_t *ta, uint32_t timer_freq,
     const struct timeval *time)
 {
@@ -124 +124 @@
  *  @return Nonzero if whole period expired, zero if part of period expired
  */
-int rtl8139_timer_act_step(rtl8139_timer_act_t * ta, uint32_t *new_reg)
+int rtl8139_timer_act_step(rtl8139_timer_act_t *ta, uint32_t *new_reg)
 {
         uint32_t next_val = 0;