Attachment 5215 Details for Bug 12631 – file.diff

[patch] file.diff

file.diff (text/plain), 1.45 KB, created by takawata on 1999-07-13 22:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takawata

Created: 1999-07-13 22:50:01 UTC

Size: 1.45 KB

patch

obsolete

>--- /home/ctm/src/sys/pci/intpm.c	Tue May 11 10:23:15 1999
>+++ intpm.c	Fri Jun  4 00:58:03 1999
>@@ -244,16 +244,18 @@
> 		return 1;
> 		
> 	}
>-	if(sc->isbusy&&(status&(PIIX4_SMBHSTSTAT_INTR|
>+	if(status&(PIIX4_SMBHSTSTAT_INTR|
> 				PIIX4_SMBHSTSTAT_ERR|
> 				PIIX4_SMBHSTSTAT_BUSC|
>-				PIIX4_SMBHSTSTAT_FAIL))){
>+				PIIX4_SMBHSTSTAT_FAIL)){
> 		int tmp;
>-		sc->isbusy=0;
> 		tmp=bus_space_read_1(sc->st,sc->sh,PIIX4_SMBHSTCNT);
> 		bus_space_write_1(sc->st,sc->sh,PIIX4_SMBHSTCNT,
> 				  tmp&~PIIX4_SMBHSTCNT_INTREN);
>-		wakeup(sc);
>+		if(sc->isbusy){
>+		  sc->isbusy=0;
>+		  wakeup(sc);
>+		}
> 		return 0;
> 	}
> 	return 1;/* Not Completed*/
>@@ -347,6 +349,7 @@
> intsmb_stop_poll(device_t dev){
>         int error,i;
>         struct intsmb_softc *sc = (struct intsmb_softc *)device_get_softc(dev);
>+	
> 	/*
> 	 *  In smbtx driver ,Simply waiting.
> 	 *  This loops 100-200 times.
>@@ -371,7 +374,13 @@
> 			return error;
> 		}
> 	}
>-	sc->isbusy=0;
>+	{
>+	  int tmp;
>+	  sc->isbusy=0;
>+	  tmp=bus_space_read_1(sc->st,sc->sh,PIIX4_SMBHSTCNT);
>+	  bus_space_write_1(sc->st,sc->sh,PIIX4_SMBHSTCNT,
>+			    tmp&~PIIX4_SMBHSTCNT_INTREN);
>+	}
> 	return EIO;
> }
> /*
>@@ -742,6 +751,7 @@
> {
>     struct _pcsid *ep =pci_ids;
>     u_int32_t device_id=pci_get_devid(dev);
>+
>     while (ep->type && ep->type != device_id)
> 	  ++ep;
>     if(ep->desc!=NULL){
>@@ -759,6 +769,7 @@
>         sc=(struct intpm_pci_softc *)arg;
> 	intsmb_intr(sc->smbus);
> 	intsmb_slvintr(sc->smbus);
>+	
> }
> #endif /* NPCI > 0 */
> #endif

Actions: View | Diff

Attachments on bug 12631: 5215