# HG changeset patch
# User Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
# Date 1303423306 14400
# Node ID 894e546429998f5cb8cddb0fc4d02d77332d89b6
# Parent  66dc0c7b03992d77871decd594d2923fa3f1b2a1
cp: the new POP defines another bit of the ORB

From: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

diff -r 66dc0c7b0399 -r 894e54642999 cp/include/channel.h
--- a/cp/include/channel.h	Thu Apr 21 17:47:10 2011 -0400
+++ b/cp/include/channel.h	Thu Apr 21 18:01:46 2011 -0400
@@ -60,13 +60,13 @@
 	   i:1,			/* Initial-Status-Interruption Control */
 	   a:1,			/* Address-Limit-Checking control */
 	   u:1,			/* Suppress-Suspend-Interruption Control */
-	   __zero1:1,
+	   b:1,			/* Channel-Program Type Control */
 	   h:1,			/* Format-2-IDAW Control */
 	   t:1;			/* 2K-IDAW Control */
 	u8 lpm;			/* Logical-Path Mask */
 	u8 l:1,			/* Incorrect-Length-Suppression Mode */
 	   d:1,			/* Modified-CCW-Indirect-Data-Addressing Control */
-	   __zero2:5,
+	   __zero1:5,
 	   x:1;			/* ORB-Extension Control */
 
 	/* word 2 */
diff -r 66dc0c7b0399 -r 894e54642999 cp/nucleus/io.c
--- a/cp/nucleus/io.c	Thu Apr 21 17:47:10 2011 -0400
+++ b/cp/nucleus/io.c	Thu Apr 21 18:01:46 2011 -0400
@@ -27,7 +27,6 @@
 static void __reset_reserved_fields(struct io_op *ioop)
 {
 	ioop->orb.__zero1 = 0;
-	ioop->orb.__zero2 = 0;
 
 	ioop->orb.__reserved1 = 0;
 	ioop->orb.__reserved2 = 0;