 @@ -1,14 +1,14 @@
-/* $NetBSD: brdsetup.c,v 1.38 2017/08/03 09:42:34 phx Exp $ */
+/* $NetBSD: brdsetup.c,v 1.39 2017/08/03 19:22:15 phx Exp $ */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -259,27 +259,28 @@ brdsetup(void)
 		brdtype = BRD_ENCOREPP1;
+	}
 	else if (PCI_CLASS(pcicfgread(dev11, PCI_CLASS_REG)) == PCI_CLASS_ETH) {
 		/* ADMtek AN985 (tlp) or RealTek 8169S (re) at dev 11 */
 		if (PCI_VENDOR(pcicfgread(dev11, PCI_ID_REG)) == 0x1317)
 			brdtype = BRD_KUROBOX;
 		else if (PCI_VENDOR(pcicfgread(dev11, PCI_ID_REG)) == 0x10ec) {
 			if (PCI_PRODUCT(pcicfgread(dev12,PCI_ID_REG)) != 0x3512)
 				brdtype = BRD_KUROBOX;
 			else
 				brdtype = BRD_KUROBOXT4;
+		}
+	}
-	else if (PCI_VENDOR(pcicfgread(dev15, PCI_ID_REG)) == 0x11ab) {
+	else if (PCI_VENDOR(pcicfgread(dev15, PCI_ID_REG)) == 0x1148
 	    || PCI_VENDOR(pcicfgread(dev15, PCI_ID_REG)) == 0x11ab) {
 		/* SKnet/Marvell (sk) at dev 15 */
 		brdtype = BRD_SYNOLOGY;
+	}
 	else if (PCI_VENDOR(pcicfgread(dev13, PCI_ID_REG)) == 0x1106) {
 		/* VIA 6410 (viaide) at dev 13 */
 		brdtype = BRD_STORCENTER;
+	}
 	else if (PCI_VENDOR(pcicfgread(dev16, PCI_ID_REG)) == 0x1191) {
 		/* ACARD ATP865 (acardide) at dev 16 */
 		brdtype = BRD_DLINKDSM;
+	}
 	else if (PCI_VENDOR(pcicfgread(dev16, PCI_ID_REG)) == 0x1283
 	    || PCI_VENDOR(pcicfgread(dev16, PCI_ID_REG)) == 0x1095) {
 @@ -863,28 +864,31 @@ synopcifix(struct brdprop *brd)
 		 */
 		do {
 			delay(1000 * 1000);
 			v = SYNOCPLD_READ(1);
 			printf("Power state: %02x\r", v);
 		} while (v != 0xff);
 		putchar('\n');
 	} else if (model_name != NULL && model_name[2] == '2') {
 		/*
 		 * DS207 and DS209 have a second SATA disk, which is started
 		 * with several seconds delay, but no CPLD register to
 		 * monitor the power state. So all we can do is to
 		 * wait some more seconds during SATA-init.
 		 * Also wait some seconds now, to make sure the first
 		 * disk is ready after a cold start.
 		 */
 		sata_delay[1] = SYNO_DISK_DELAY;
 		delay(10 * 1024 * 1024);
+	}
   cpld_done:
 	if (model_name != NULL) {
 		snprintf(bi_model.name, sizeof(bi_model.name), "%s", model_name);
 		bi_model.flags = cpld | version | flags;
 	} else
 		printf("No CPLD found. DS101/DS106.\n");
+}
 void
 synolaunch(struct brdprop *brd)
+{

 @@ -1,14 +1,14 @@
-/* $NetBSD: siisata.c,v 1.6 2015/09/30 14:14:32 phx Exp $ */
+/* $NetBSD: siisata.c,v 1.7 2017/08/03 19:22:15 phx Exp $ */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -115,26 +115,35 @@ siisata_init(unsigned tag, void *data)
 			/* wait some seconds to power-up the drive */
 			for (retries = 0; retries < sata_delay[n]; retries++) {
 				wakeup_drive(l, n);
 				printf("Waiting %2d seconds for powering up "
 				    "port %d.\r", sata_delay[n] - retries, n);
 				delay(1000 * 1000);
 				if ((l->presense[n] = satapresense(l, n)) != 0)
 					break;
+			}
 			putchar('\n');
 			if (l->presense[n] == 0) {
 				DPRINTF(("port %d not present\n", n));
 				continue;
 			} else {
 				/*
 				 * XXX perform_atareset() does not work
 				 * when the drive is not completely spun up?
 				 * So insert another delay here.
 				 */
 				printf("Waiting 15 seconds for port %d "
 				    "to spin up.\n", n);
 				delay(15 * 1000 * 1000);
+			}
+		}
 		if (atachkpwr(l, n) != ATA_PWR_ACTIVE) {
 			/* drive is probably sleeping, wake it up */
 			for (retries = 0; retries < 20; retries++) {
 				wakeup_drive(l, n);
 				DPRINTF(("port %d spinning up...\n", n));
 				delay(1000 * 1000);
 				l->presense[n] = perform_atareset(l, n);
 				if (atachkpwr(l, n) == ATA_PWR_ACTIVE)
 					break;
+			}
 		} else {

 @@ -8,13 +8,15 @@
 .6:	build altboot.img to fake a Linux kernel module, supports bootargs
 .7:	ST1023/IP1000A driver, load kernels from memory (mem:), possibility
 	to replace altboot with a new version while running, interactive
 	mode, default boot path is now wd0:netbsd in multiuser mode
 .8:	Iomega support, IT821x & VT6410 IDE support, fixed interrupt
 	issue, exception handler and sat-controller test mode (DEBUG)
 .9:	Support PATA drive configuration option. Wait until drives are
         ready after cold-start. Wake up drives from standby mode.
         A default command line can be saved to flash as initrd image.
 .10:	Read correct MAC address from flash on QNAP-TS systems with re(4)
 	NIC.
 .11:	Pass precise model information and flags with bootinfo.
 	Synology DS207/209 LED and 2nd disk power-up support.
 .12:	Some more Synology DS20x fixes, to make sure both drives have been
 	spun up. Also detect PCI-vendor 0x1148 (S&K) as Synology.