From 6b037e240800818283de639289a39602fd523bd9 Mon Sep 17 00:00:00 2001 From: xtraeme Date: Fri, 25 Jan 2008 21:41:48 +0000 Subject: [PATCH] Make it print the correct version for AHCI 1.2 controllers. --- sys/dev/ic/ahcisata_core.c | 7 +++++-- sys/dev/ic/ahcisatareg.h | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/dev/ic/ahcisata_core.c b/sys/dev/ic/ahcisata_core.c index 5bef2cd8279b..a2c88367d60b 100644 --- a/sys/dev/ic/ahcisata_core.c +++ b/sys/dev/ic/ahcisata_core.c @@ -1,4 +1,4 @@ -/* $NetBSD: ahcisata_core.c,v 1.10 2007/12/04 15:42:05 spz Exp $ */ +/* $NetBSD: ahcisata_core.c,v 1.11 2008/01/25 21:41:48 xtraeme Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.10 2007/12/04 15:42:05 spz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.11 2008/01/25 21:41:48 xtraeme Exp $"); #include #include @@ -234,6 +234,9 @@ ahci_attach(struct ahci_softc *sc) case AHCI_VS_11: aprint_normal("1.1"); break; + case AHCI_VS_12: + aprint_normal("1.2"); + break; default: aprint_normal("0x%x", ahci_rev); break; diff --git a/sys/dev/ic/ahcisatareg.h b/sys/dev/ic/ahcisatareg.h index 0ebf5d1c888a..e611e5642619 100644 --- a/sys/dev/ic/ahcisatareg.h +++ b/sys/dev/ic/ahcisatareg.h @@ -1,4 +1,4 @@ -/* $NetBSD: ahcisatareg.h,v 1.3 2007/12/25 18:33:37 perry Exp $ */ +/* $NetBSD: ahcisatareg.h,v 1.4 2008/01/25 21:41:48 xtraeme Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -146,6 +146,7 @@ struct ahci_r_fis { #define AHCI_VS 0x10 /* AHCI version */ #define AHCI_VS_10 0x00010000 /* AHCI spec 1.0 */ #define AHCI_VS_11 0x00010100 /* AHCI spec 1.1 */ +#define AHCI_VS_12 0x00010200 /* AHCI spec 1.2 */ #define AHCI_CC_CTL 0x14 /* command completion coalescing control */ #define AHCI_CC_TV_MASK 0xffff0000 /* timeout value */