Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Various updates to support dynamically starting drivers.

Browse Source 
Output during initialization should be suppressed. Unless an error occurs.
Note that main() can now be main(int argc, char **argv) and arguments can
be passed when bringing up the driver.
This commit is contained in:
Jorrit Herder
2005-08-02 15:30:36 +00:00
parent f44725b777
commit 52965b6f17
14 changed files with 72 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/dpeth/dp.c
View File

@@ -49,6 +49,12 @@
** +------------+---------+---------+---------------+
**
** $Log$
** Revision 1.5 2005/08/02 15:30:35 jnherder
** Various updates to support dynamically starting drivers.
** Output during initialization should be suppressed. Unless an error occurs.
** Note that main() can now be main(int argc, char **argv) and arguments can
** be passed when bringing up the driver.
**
** Revision 1.4 2005/07/29 12:44:41 jnherder
** Small update to SYS_IRQCTL -> setting an interrupt policy now allows the caller
** to provide an index (0 .. 31) that is passed in the HARD_INT message when an
@@ -79,11 +85,10 @@
#include "dp.h"
#if ENABLE_NETWORKING == 1
/*
** Local data
*/
extern int errno;
static dpeth_t de_table[DE_PORT_NR];
static int dpeth_tasknr = ANY;
@@ -556,15 +561,15 @@ static void do_watchdog(void *message)
** Name: int dpeth_task(void)
** Function: Main entry for dp task
*/
PUBLIC int main(void)
PUBLIC int main(int argc, char **argv)
{
message m;
dpeth_t *dep;
int rc, fkeys, sfkeys;
/* Get precess number */
if ((rc = getprocnr(&dpeth_tasknr)) != OK)
panic(DevName, "getprocnr() failed", rc);
if ((dpeth_tasknr = getprocnr()) < 0)
panic(DevName, "getprocnr() failed", errno);
#if defined USE_IOPL
/* Request direct access to hardware I/O ports */
if ((rc = sys_enable_iop(dpeth_tasknr)) != OK)
@@ -575,6 +580,7 @@ PUBLIC int main(void)
if ((fkey_map(&fkeys, &sfkeys)) != OK)
printf("%s: couldn't program Shift+F8 key (%d)\n", DevName, errno);
#ifdef ETH_IGN_PROTO
{
static u16_t eth_ign_proto = 0;
@@ -585,7 +591,6 @@ PUBLIC int main(void)
}
#endif
printf("DPETH: ethernet driver task initialized (process No. %d)\n", dpeth_tasknr);
while (TRUE) {
if ((rc = receive(ANY, &m)) != OK) panic(dep->de_name, RecvErrMsg, rc);
@@ -616,7 +621,7 @@ PUBLIC int main(void)
case DL_STOP: /* Stop device */
do_stop(&m);
break;
case SYS_EVENT: {
case SYS_SIG: {
sigset_t sigset = m.NOTIFY_ARG;
if (sigismember(&sigset, SIGKSTOP)) { /* Shut down */
for (rc = 0; rc < DE_PORT_NR; rc += 1) {
@@ -652,8 +657,5 @@ PUBLIC int main(void)
return OK; /* Never reached, but keeps compiler happy */
}
#else
int main(void) { return 0; }
#endif /* ENABLE_NETWORKING */
/** dp.c **/

8
drivers/dpeth/dp.h
View File

@@ -6,6 +6,12 @@
** Interface description for ethernet device driver
**
** $Log$
** Revision 1.2 2005/08/02 15:30:35 jnherder
** Various updates to support dynamically starting drivers.
** Output during initialization should be suppressed. Unless an error occurs.
** Note that main() can now be main(int argc, char **argv) and arguments can
** be passed when bringing up the driver.
**
** Revision 1.1 2005/06/29 10:16:46 beng
** Import of dpeth 3c501/3c509b/.. ethernet driver by
** Giovanni Falzoni <fgalzoni@inwind.it>.
@@ -23,7 +29,7 @@
#undef ENABLE_WDETH
#undef ENABLE_DP8390
#define ENABLE_NETWORKING ENABLE_DPETH /** (from /usr/include/minix/config.h **/
#define ENABLE_NETWORKING 1
#define ENABLE_3C501 1 /* enable 3Com Etherlink I board */
#define ENABLE_3C503 1 /* enable 3Com Etherlink II board */