Remove camq_regen(). We already perform modular comparisons

for generation counts, so no further steps to deal with generation
count wrap are required.

Fix an off by one problem in the camq heap code.

1 files changed, 12 insertions, 1 deletions

diff --git a/sys/cam/cam.h b/sys/cam/cam.h
index 21aea02..c182fd6 100644
--- a/sys/cam/cam.h
+++ b/sys/cam/cam.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ *      $Id: cam.h,v 1.1 1998/09/15 06:33:23 gibbs Exp $
  */
 
 #ifndef _CAM_CAM_H
@@ -74,6 +74,17 @@ typedef struct {
 #define CAM_DONEQ_INDEX		-3	
 } cam_pinfo;
 
+/*
+ * Macro to compare two generation numbers.  It is used like this:  
+ *
+ *	if (GENERATIONCMP(a, >=, b))
+ *		...;
+ *
+ * GERERATIONCMP uses modular arithmetic to guard against wraps
+ * wraps in the generation number.
+ */
+#define GENERATIONCMP(x, op, y) ((int32_t)((x) - (y)) op 0)
+
 /* CAM flags */
 typedef enum {
 	CAM_FLAG_NONE		= 0x00,