3c3
< ** $Id: ncr.c,v 1.114 1998/02/04 03:47:16 eivind Exp $
---
> ** $Id: ncr.c,v 1.115 1998/02/09 06:10:56 eivind Exp $
501,508c501,508
< struct timeval start;
< struct timeval end;
< struct timeval select;
< struct timeval command;
< struct timeval data;
< struct timeval status;
< struct timeval disconnect;
< struct timeval reselect;
---
> int start;
> int end;
> int select;
> int command;
> int data;
> int status;
> int disconnect;
> int reselect;
1290c1290
< static int ncr_delta (struct timeval * from, struct timeval * to);
---
> static int ncr_delta (int * from, int * to);
1345c1345
< "\n$Id: ncr.c,v 1.114 1998/02/04 03:47:16 eivind Exp $\n";
---
> "\n$Id: ncr.c,v 1.115 1998/02/09 06:10:56 eivind Exp $\n";
1474,1475c1474,1475
< #define KVAR_TIME_TV_SEC (0)
< #define KVAR_TIME (1)
---
> #define KVAR_SECOND (0)
> #define KVAR_TICKS (1)
1486c1486
< { &time.tv_sec, &time, &ncr_cache };
---
> { &time_second, &ticks, &ncr_cache };
1494c1494
< KVAR (KVAR_TIME_TV_SEC),
---
> KVAR (KVAR_SECOND),
1713c1713
< KVAR (KVAR_TIME),
---
> KVAR (KVAR_TICKS),
1895c1895
< KVAR (KVAR_TIME),
---
> KVAR (KVAR_TICKS),
1917c1917
< KVAR (KVAR_TIME),
---
> KVAR (KVAR_TICKS),
2222c2222
< KVAR (KVAR_TIME),
---
> KVAR (KVAR_TICKS),
2465c2465
< ** KVAR (KVAR_TIME),
---
> ** KVAR (KVAR_TICKS),
2492c2492
< ** KVAR (KVAR_TIME),
---
> ** KVAR (KVAR_TICKS),
3061c3061
< *p++ =(ncrcmd) KVAR (KVAR_TIME);
---
> *p++ =(ncrcmd) KVAR (KVAR_TICKS);
3085c3085
< *p++ =(ncrcmd) KVAR (KVAR_TIME);
---
> *p++ =(ncrcmd) KVAR (KVAR_TICKS);
4183c4183
< gettime(&cp->phys.header.stamp.start);
---
> cp->phys.header.stamp.start = ticks;
4478c4478
< cp->tlimit = time.tv_sec + xp->timeout / 1000 + 2;
---
> cp->tlimit = time_second + xp->timeout / 1000 + 2;
5446c5446
< u_long thistime = time.tv_sec;
---
> u_long thistime = time_second;
5763c5763
< if (time.tv_sec - np->regtime.tv_sec>10) {
---
> if (time_second - np->regtime.tv_sec>10) {
5765c5765
< gettime(&np->regtime);
---
> getmicrotime(&np->regtime);
7329c7329
< static int ncr_delta (struct timeval * from, struct timeval * to)
---
> static int ncr_delta (int *from, int *to)
7331,7334c7331,7333
< if (!from->tv_sec) return (-1);
< if (!to ->tv_sec) return (-2);
< return ( (to->tv_sec - from->tv_sec - 2)*1000+
< +(to->tv_usec - from->tv_usec + 2000000)/1000);
---
> if (!from) return (-1);
> if (!to) return (-2);
> return ((to - from) * 1000 / hz);
7343c7342
< gettime(&PROFILE.end);
---
> PROFILE.end = ticks;