From 4907dfd43d967a4f30839e7f60abaef9472ebba4 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Wed, 6 Jan 1999 19:10:06 +0000 Subject: [PATCH] remove defining storage twice --- src/drv/old/drvBB232.c | 1 - src/drv/old/drvBB232.h | 5 +---- src/drv/old/drvMsg.c | 7 +++++-- src/drv/old/drvTy232.h | 5 +---- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/drv/old/drvBB232.c b/src/drv/old/drvBB232.c index 658d8b836..bd0b4bca6 100644 --- a/src/drv/old/drvBB232.c +++ b/src/drv/old/drvBB232.c @@ -31,7 +31,6 @@ * */ -#define DRVBB232_C #include #include diff --git a/src/drv/old/drvBB232.h b/src/drv/old/drvBB232.h index d90bb1a69..77f543bb4 100644 --- a/src/drv/old/drvBB232.h +++ b/src/drv/old/drvBB232.h @@ -58,10 +58,7 @@ typedef struct { msgParmBlock *pparmBlock; } drvBB232Link; -#ifndef DRVBB232_C -extern -#endif -msgDrvBlock drvBB232Block; +extern msgDrvBlock drvBB232Block; #define BB232_DEFAULT_AGE (sysClkRateGet()) /* 1 second */ diff --git a/src/drv/old/drvMsg.c b/src/drv/old/drvMsg.c index afd77d4aa..77e592eb9 100644 --- a/src/drv/old/drvMsg.c +++ b/src/drv/old/drvMsg.c @@ -380,8 +380,11 @@ struct link *plink; /* I/O link structure from record */ return(NULL); } sprintf(name, "%s", pparmBlock->pdrvBlock->taskName); - if ((taskId = taskSpawn(name, pparmBlock->pdrvBlock->taskPri, pparmBlock->pdrvBlock->taskOpt, pparmBlock->pdrvBlock->taskStack, msgTask, pparmBlock->pdrvBlock, pmsgLink)) == ERROR) - { + if ((taskId = taskSpawn( + name, pparmBlock->pdrvBlock->taskPri, pparmBlock->pdrvBlock->taskOpt, + pparmBlock->pdrvBlock->taskStack, msgTask, pparmBlock->pdrvBlock, + pmsgLink, + 0,0,0,0,0,0,0,0)) == ERROR) { printf("Message driver: Failed to start link task %s\n", name); /* BUG --delete the FASTLOCK in here */ status = ERROR; diff --git a/src/drv/old/drvTy232.h b/src/drv/old/drvTy232.h index 07704d7b8..6b5a46527 100644 --- a/src/drv/old/drvTy232.h +++ b/src/drv/old/drvTy232.h @@ -69,9 +69,6 @@ typedef struct { msgParmBlock *pparmBlock; } devTy232Link; -#ifndef DRVTY232_C -extern -#endif -msgDrvBlock drv232Block; +extern msgDrvBlock drv232Block; #endif