Mon Jun 12 23:51:41 2017 UTC ()
Macro argument parentheses paranoia.
Annotate another register initialism.


(jakllsch)
diff -r1.7.42.1 -r1.7.42.2 src/sys/dev/ic/siisatareg.h

cvs diff -r1.7.42.1 -r1.7.42.2 src/sys/dev/ic/siisatareg.h (expand / switch to unified diff)

--- src/sys/dev/ic/siisatareg.h 2017/04/24 13:05:26 1.7.42.1
+++ src/sys/dev/ic/siisatareg.h 2017/06/12 23:51:40 1.7.42.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: siisatareg.h,v 1.7.42.1 2017/04/24 13:05:26 jakllsch Exp $ */ 1/* $NetBSD: siisatareg.h,v 1.7.42.2 2017/06/12 23:51:40 jakllsch Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2007, 2008, 2009, 2010, 2011 Jonathan A. Kollasch. 4 * Copyright (c) 2007, 2008, 2009, 2010, 2011 Jonathan A. Kollasch.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -171,29 +171,29 @@ struct siisata_prb { @@ -171,29 +171,29 @@ struct siisata_prb {
171#define PRO_PIES 0x1010 /* port interrupt enable set */ 171#define PRO_PIES 0x1010 /* port interrupt enable set */
172#define PRO_PIEC 0x1014 /* port interrupt enable clear */ 172#define PRO_PIEC 0x1014 /* port interrupt enable clear */
173#define PRO_32BAUA 0x101c /* 32-bit activation upper address */ 173#define PRO_32BAUA 0x101c /* 32-bit activation upper address */
174#define PRO_PCEF 0x1020 /* port command execution fifo */ 174#define PRO_PCEF 0x1020 /* port command execution fifo */
175#define PRO_PCE 0x1024 /* port command error */ 175#define PRO_PCE 0x1024 /* port command error */
176#define PRO_PFISC 0x1028 /* port FIS config */ 176#define PRO_PFISC 0x1028 /* port FIS config */
177#define PRO_PCIRFIFOT 0x102c /* pci request fifo threshhold */ 177#define PRO_PCIRFIFOT 0x102c /* pci request fifo threshhold */
178#define PRO_P8B10BDEC 0x1040 /* port 8B/10B decode error counter */ 178#define PRO_P8B10BDEC 0x1040 /* port 8B/10B decode error counter */
179#define PRO_PCRCEC 0x1044 /* port crc error count */ 179#define PRO_PCRCEC 0x1044 /* port crc error count */
180#define PRO_PHEC 0x1048 /* port handshake error count */ 180#define PRO_PHEC 0x1048 /* port handshake error count */
181#define PRO_PPHYC 0x1050 /* phy config */ 181#define PRO_PPHYC 0x1050 /* phy config */
182#define PRO_PSS 0x1800 /* port slot status */ 182#define PRO_PSS 0x1800 /* port slot status */
183/* technically this is a shadow of the CAR */ 183/* technically this is a shadow of the CAR */
184#define PRO_CAR 0x1c00 184#define PRO_CAR 0x1c00 /* command activation register */
185 185
186#define PRO_CARX(p,s) (PRX(p, PRO_CAR) + s * sizeof(uint64_t)) 186#define PRO_CARX(p,s) (PRX(p, PRO_CAR) + (s) * sizeof(uint64_t))
187 187
188#define PRO_PCR 0x1e04 /* port context register */ 188#define PRO_PCR 0x1e04 /* port context register */
189#define PRO_SCONTROL 0x1f00 /* SControl */ 189#define PRO_SCONTROL 0x1f00 /* SControl */
190#define PRO_SSTATUS 0x1f04 /* SStatus */ 190#define PRO_SSTATUS 0x1f04 /* SStatus */
191#define PRO_SERROR 0x1f08 /* SError */ 191#define PRO_SERROR 0x1f08 /* SError */
192#define PRO_SACTIVE 0x1f0c /* SActive */ 192#define PRO_SACTIVE 0x1f0c /* SActive */
193 193
194 194
195/* Port Command Error */ 195/* Port Command Error */
196#define PR_PCE_DEVICEERROR 1 196#define PR_PCE_DEVICEERROR 1
197#define PR_PCE_SDBERROR 2 197#define PR_PCE_SDBERROR 2
198#define PR_PCE_DATAFISERROR 3 198#define PR_PCE_DATAFISERROR 3
199#define PR_PCE_SENDFISERROR 4 199#define PR_PCE_SENDFISERROR 4