oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm:replace ifdef's by runtime checks in the lan8710a driver.

Browse Source 
Change-Id: I1f345240b88362658e987a85f1642324471119c3
This commit is contained in:
Kees Jongenburger 2014-02-10 12:19:33 +01:00
parent 7e11828c6e
commit 5ec8c93e95
1 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/lan8710a/lan8710a.c
View File

@ -3,12 +3,12 @@
#include <net/gen/ether.h> #include <net/gen/ether.h>
#include <net/gen/eth_io.h> #include <net/gen/eth_io.h>
#include <minix/sysutil.h> #include <minix/sysutil.h>
#include <minix/board.h>
#include "assert.h" #include "assert.h"
#include "lan8710a.h" #include "lan8710a.h"
#include "lan8710a_reg.h" #include "lan8710a_reg.h"
/* Local functions */ /* Local functions */
#ifdef AM335X
static void lan8710a_readv_s(message *m, int from_int); static void lan8710a_readv_s(message *m, int from_int);
static void lan8710a_writev_s(message *m, int from_int); static void lan8710a_writev_s(message *m, int from_int);
static void lan8710a_conf(message *m); static void lan8710a_conf(message *m);
@ -45,7 +45,6 @@ static lan8710a_t lan8710a_state;
static void sef_local_startup(void); static void sef_local_startup(void);
static int sef_cb_init_fresh(int type, sef_init_info_t *info); static int sef_cb_init_fresh(int type, sef_init_info_t *info);
static void sef_cb_signal_handler(int signal); static void sef_cb_signal_handler(int signal);
#endif /* AM335X */
/*============================================================================* /*============================================================================*
* main * * main *
@ -53,11 +52,15 @@ static void sef_cb_signal_handler(int signal);
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
#ifdef AM335X
/* Local variables */ /* Local variables */
message m; message m;
int r; int r;
int ipc_status; int ipc_status;
struct machine machine ;
sys_getmachine(&machine);
if ( BOARD_IS_BB(machine.board_id)) {
/* SEF local startup */ /* SEF local startup */
env_setargs(argc, argv); env_setargs(argc, argv);
@ -95,10 +98,10 @@ main(int argc, char *argv[])
} }
} }
} }
#endif /* AM335X */ }
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
#ifdef AM335X
/*============================================================================* /*============================================================================*
* sef_local_startup * * sef_local_startup *
*============================================================================*/ *============================================================================*/
@ -1236,4 +1239,3 @@ lan8710a_t *e;
panic("send() failed: %d", r); panic("send() failed: %d", r);
} }
} }
#endif /* AM335X */