Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv17530/src/blob
Modified Files:
main.c param_block.c
Log Message:
simplified paramater block \(WARNING: breaks old param blocks\!\)
Index: main.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/main.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- main.c 2002/01/15 02:57:44 1.26
+++ main.c 2002/01/21 19:45:17 1.27
@@ -78,7 +78,7 @@
int numRead = 0;
char commandline[MAX_COMMANDLINE_LENGTH];
#ifdef PARAM_START
- u32 conf;
+ u32 conf = 0;
#endif
/* call subsystems */
Index: param_block.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/param_block.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- param_block.c 2002/01/15 01:59:34 1.6
+++ param_block.c 2002/01/21 19:45:17 1.7
@@ -96,16 +96,6 @@
__ptagtable(PTAG_BAUD, parse_ptag_baud);
-static int parse_ptag_gpio(const struct ptag *ptag)
-{
- GPDR &= ~ptag->u.gpio.mask;
- if ((GPSR & ptag->u.gpio.mask) == ptag->u.gpio.level)
- return -1;
- else return 0;
-}
-
-__ptagtable(PTAG_GPIO, parse_ptag_gpio);
-
/*
* Scan the tag table for this tag, and call its parse function.
* The tag table is built by the linker from all the __ptagtable
@@ -117,14 +107,8 @@
struct ptagtable *t;
for (t = &__ptagtable_begin; t < &__ptagtable_end; t++)
- if (ptag->hdr.ptag == t->ptag &&
- ((*conf & ptag->hdr.conf_mask) == ptag->hdr.conf)) {
- if (t->parse(ptag) == -1) {
- *conf |= ptag->hdr.fail_set_mask;
- *conf &= ~ptag->hdr.fail_clear_mask;
- }
- break;
- }
+ if (ptag->hdr.ptag == t->ptag && *conf == ptag->hdr.conf)
+ t->parse(ptag);
return t < &__ptagtable_end;
}
|
