Module Name: src
Committed By: dsl
Date: Sun Jul 15 10:56:50 UTC 2012
Modified Files:
src/sys/dev/pci: nside.c
Log Message:
Some namespace protection (and add greppablity).
Prefix the DRIVE_ and DRIVET_ constants from atavar.h with ATA_.
Don't use an enum for drive_type - you don't know how big it will be.
Move driver_type to avoid implicit structure padding (esp on arm).
This change is purely lexical and mechanical.
Update to 6.99.9 - this wasn't done when the SATA PMP changes
were made - I'm sure they warranted a bump.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/nside.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/nside.c
diff -u src/sys/dev/pci/nside.c:1.3 src/sys/dev/pci/nside.c:1.4
--- src/sys/dev/pci/nside.c:1.3 Mon Jul 2 18:15:47 2012
+++ src/sys/dev/pci/nside.c Sun Jul 15 10:56:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: nside.c,v 1.3 2012/07/02 18:15:47 bouyer Exp $ */
+/* $NetBSD: nside.c,v 1.4 2012/07/15 10:56:50 dsl Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nside.c,v 1.3 2012/07/02 18:15:47 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nside.c,v 1.4 2012/07/15 10:56:50 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -173,12 +173,12 @@ natsemi_setup_channel(struct ata_channel
for (drive = 0; drive < 2; drive++) {
drvp = &chp->ch_drive[drive];
/* If no drive, skip */
- if (drvp->drive_type == DRIVET_NONE)
+ if (drvp->drive_type == ATA_DRIVET_NONE)
continue;
ndrives++;
/* add timing values, setup DMA if needed */
- if ((drvp->drive_flags & DRIVE_DMA) == 0) {
+ if ((drvp->drive_flags & ATA_DRIVE_DMA) == 0) {
tim = natsemi_pio_pulse[drvp->PIO_mode] |
(natsemi_pio_recover[drvp->PIO_mode] << 4);
} else {
