PERFORCE change 101329 for review

[Kip Macy]

http://perforce.freebsd.org/chv.cgi?CH=101329

Change 101329 by kmacy at kmacy_storage:sun4v_work_stable on 2006/07/12 05:41:27

	revert mpt_read - fix select callers

Affected files ...

.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mpt/mpt.c#6 edit
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mpt/mpt.h#7 edit

Differences ...

==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/mpt/mpt.c#6 (text+ko) ====

@@ -824,19 +824,19 @@
 }
 
 /******************************* Doorbell Access ******************************/
-static __inline uint32_t mpt_rd_db(struct mpt_softc *mpt);
-static __inline  uint32_t mpt_rd_intr(struct mpt_softc *mpt);
+static __inline uint16_t mpt_rd_db(struct mpt_softc *mpt);
+static __inline  uint16_t mpt_rd_intr(struct mpt_softc *mpt);
 
-static __inline uint32_t
+static __inline uint16_t
 mpt_rd_db(struct mpt_softc *mpt)
 {
-	return mpt_read(mpt, MPT_OFFSET_DOORBELL);
+	return mpt_read_16(mpt, MPT_OFFSET_DOORBELL);
 }
 
-static __inline uint32_t
+static __inline uint16_t
 mpt_rd_intr(struct mpt_softc *mpt)
 {
-	return mpt_read(mpt, MPT_OFFSET_INTR_STATUS);
+	return mpt_read_16(mpt, MPT_OFFSET_INTR_STATUS);
 }
 
 /* Busy wait for a door bell to be read by IOC */
@@ -1359,12 +1359,12 @@
 mpt_recv_handshake_reply(struct mpt_softc *mpt, size_t reply_len, void *reply)
 {
 	int left, reply_left;
-	u_int16_t *data16;
+	uint16_t *data16;
 	MSG_DEFAULT_REPLY *hdr;
 
 	/* We move things out in 16 bit chunks */
 	reply_len >>= 1;
-	data16 = (u_int16_t *)reply;
+	data16 = (uint16_t *)reply;
 
 	hdr = (MSG_DEFAULT_REPLY *)reply;
 

==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/mpt/mpt.h#7 (text+ko) ====

@@ -832,7 +832,7 @@
 static __inline uint32_t
 mpt_read(struct mpt_softc *mpt, int offset)
 {
-	return (bus_space_read_2(mpt->pci_st, mpt->pci_sh, offset));
+	return (bus_space_read_4(mpt->pci_st, mpt->pci_sh, offset));
 }
 
 static __inline uint16_t