r1912 - trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches

[Andres Salomon]

Author: dilinger-guest
Date: 2004-11-24 23:53:14 -0700 (Wed, 24 Nov 2004)
New Revision: 1912

Modified:
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/ata_piix-combinde-mode-fix-2.dpatch
Log:
wardrobe malfunction.


Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/ata_piix-combinde-mode-fix-2.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/ata_piix-combinde-mode-fix-2.dpatch	2004-11-25 06:30:29 UTC (rev 1911)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/ata_piix-combinde-mode-fix-2.dpatch	2004-11-25 06:53:14 UTC (rev 1912)
@@ -1,25 +1,14 @@
-#! /bin/sh -e 
+#! /bin/sh -e
 ## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Description: libata: PCI IDE legacy mode fix
-## DP: Patch author: Bartlomiej Zolnierkiewicz
-## DP: Upstream status: included
+## DP: Patch author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
+## DP: Upstream status: backported
 
 . $(dirname $0)/DPATCH
 
 @DPATCH@
-# origin: bzolnier (BitKeeper)
-# cset: 1.1988.91.1 (2.6) key=416b214bV7CwIRgRqoomLi6qTfcGmw
-# inclusion: upstream
-# descrition: [PATCH] libata: PCI IDE legacy mode fix
-# revision date: Mon, 08 Nov 2004 16:12:47 +0900
-#
-# rset: ChangeSet|1.1988.89.2..1.1988.91.1
-# rset: drivers/scsi/libata-core.c|1.100..1.101
-# rset: include/linux/libata.h|1.55..1.56
-# rset: drivers/scsi/ata_piix.c|1.31..1.32
-#
 # This is a BitKeeper generated diff -Nru style patch.
 #
 # ChangeSet
@@ -33,21 +22,21 @@
 #   
 #   Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
 # 
-# include/linux/libata.h
-#   2004/10/11 15:52:22-04:00 bzolnier@elka.pw.edu.pl +2 -0
+# drivers/scsi/ata_piix.c
+#   2004/10/11 15:52:22-04:00 bzolnier@elka.pw.edu.pl +10 -10
 #   PCI IDE legacy mode fix
 # 
 # drivers/scsi/libata-core.c
 #   2004/10/11 15:52:22-04:00 bzolnier@elka.pw.edu.pl +8 -0
 #   PCI IDE legacy mode fix
 # 
-# drivers/scsi/ata_piix.c
-#   2004/10/11 15:52:22-04:00 bzolnier@elka.pw.edu.pl +10 -10
+# include/linux/libata.h
+#   2004/10/11 15:52:22-04:00 bzolnier@elka.pw.edu.pl +2 -0
 #   PCI IDE legacy mode fix
 # 
 diff -Nru a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
---- a/drivers/scsi/ata_piix.c	2004-11-08 16:12:47 +09:00
-+++ b/drivers/scsi/ata_piix.c	2004-11-08 16:12:47 +09:00
+--- a/drivers/scsi/ata_piix.c	2004-11-24 22:45:54 -08:00
++++ b/drivers/scsi/ata_piix.c	2004-11-24 22:45:54 -08:00
 @@ -268,7 +268,7 @@
  		goto cbl40;
  
@@ -86,10 +75,10 @@
  				return 1;
  	}
  
-@@ -373,7 +373,7 @@
- {
+@@ -394,7 +394,7 @@
+ 	unsigned int pio	= adev->pio_mode - XFER_PIO_0;
  	struct pci_dev *dev	= ap->host_set->pdev;
- 	unsigned int is_slave	= (adev->flags & ATA_DFLAG_MASTER) ? 0 : 1;
+ 	unsigned int is_slave	= (adev->devno != 0);
 -	unsigned int master_port= ap->port_no ? 0x42 : 0x40;
 +	unsigned int master_port= ap->hard_port_no ? 0x42 : 0x40;
  	unsigned int slave_port	= 0x44;
@@ -121,8 +110,8 @@
  	int u_flag		= 1 << drive_dn;
  	int v_flag		= 0x01 << drive_dn;
 diff -Nru a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
---- a/drivers/scsi/libata-core.c	2004-11-08 16:12:47 +09:00
-+++ b/drivers/scsi/libata-core.c	2004-11-08 16:12:47 +09:00
+--- a/drivers/scsi/libata-core.c	2004-11-24 22:45:54 -08:00
++++ b/drivers/scsi/libata-core.c	2004-11-24 22:45:54 -08:00
 @@ -3032,6 +3032,8 @@
  	ap->ctl = ATA_DEVCTL_OBS;
  	ap->host_set = host_set;
@@ -132,27 +121,24 @@
  	ap->pio_mask = ent->pio_mask;
  	ap->mwdma_mask = ent->mwdma_mask;
  	ap->udma_mask = ent->udma_mask;
-@@ -3163,6 +3163,8 @@
- 		probe_ent->port[0].ctl_addr = 0x3f6;
- 		probe_ent->n_ports = 1;
- 		probe_ent->irq = 14;
-+		probe_ent->hard_port_no = 0;
-+		probe_ent->legacy_mode = 1;
- 		ata_std_ports(&probe_ent->port[0]);
+@@ -3338,8 +3340,14 @@
+ 	probe_ent[0].n_ports = 1;
+ 	probe_ent[0].irq = 14;
  
- 		probe_ent2->port[0].cmd_addr = 0x170;
-@@ -3171,6 +3173,8 @@
- 		probe_ent2->port[0].bmdma_addr = pci_resource_start(pdev, 4)+8;
- 		probe_ent2->n_ports = 1;
- 		probe_ent2->irq = 15;
-+		probe_ent->hard_port_no = 1;
-+		probe_ent->legacy_mode = 1;
- 		ata_std_ports(&probe_ent2->port[0]);
++	probe_ent[0].hard_port_no = 0;
++	probe_ent[0].legacy_mode = 1;
++
+ 	probe_ent[1].n_ports = 1;
+ 	probe_ent[1].irq = 15;
++
++	probe_ent[1].hard_port_no = 1;
++	probe_ent[1].legacy_mode = 1;
  
- 		probe_ent2->sht = port1->sht;
+ 	probe_ent[0].port[0].cmd_addr = 0x1f0;
+ 	probe_ent[0].port[0].altstatus_addr =
 diff -Nru a/include/linux/libata.h b/include/linux/libata.h
---- a/include/linux/libata.h	2004-11-08 16:12:47 +09:00
-+++ b/include/linux/libata.h	2004-11-08 16:12:47 +09:00
+--- a/include/linux/libata.h	2004-11-24 22:45:54 -08:00
++++ b/include/linux/libata.h	2004-11-24 22:45:54 -08:00
 @@ -189,6 +189,7 @@
  	Scsi_Host_Template	*sht;
  	struct ata_ioports	port[ATA_MAX_PORTS];