Tue Aug 4 08:49:02 2009 UTC ()
Fix a bug of BGE_RDMA_MODE_FIFO_LONG_BURST definition.

Confirmed by msaito@.


(taca)
diff -r1.52 -r1.53 src/sys/dev/pci/if_bgereg.h
cvs diff -r1.52 -r1.53 src/sys/dev/pci/if_bgereg.h (expand / switch to unified diff)

--- src/sys/dev/pci/if_bgereg.h 2009/04/23 10:47:44 1.52
+++ src/sys/dev/pci/if_bgereg.h 2009/08/04 08:49:02 1.53
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: if_bgereg.h,v 1.52 2009/04/23 10:47:44 msaitoh Exp $ */ 1/* $NetBSD: if_bgereg.h,v 1.53 2009/08/04 08:49:02 taca Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Wind River Systems 3 * Copyright (c) 2001 Wind River Systems
4 * Copyright (c) 1997, 1998, 1999, 2001 4 * Copyright (c) 1997, 1998, 1999, 2001
5 * Bill Paul <wpaul@windriver.com>. All rights reserved. 5 * Bill Paul <wpaul@windriver.com>. 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.
@@ -1343,27 +1343,27 @@ @@ -1343,27 +1343,27 @@
1343#define BGE_RDMAMODE_RESET 0x00000001 1343#define BGE_RDMAMODE_RESET 0x00000001
1344#define BGE_RDMAMODE_ENABLE 0x00000002 1344#define BGE_RDMAMODE_ENABLE 0x00000002
1345#define BGE_RDMAMODE_PCI_TGT_ABRT_ATTN 0x00000004 1345#define BGE_RDMAMODE_PCI_TGT_ABRT_ATTN 0x00000004
1346#define BGE_RDMAMODE_PCI_MSTR_ABRT_ATTN 0x00000008 1346#define BGE_RDMAMODE_PCI_MSTR_ABRT_ATTN 0x00000008
1347#define BGE_RDMAMODE_PCI_PERR_ATTN 0x00000010 1347#define BGE_RDMAMODE_PCI_PERR_ATTN 0x00000010
1348#define BGE_RDMAMODE_PCI_ADDROFLOW_ATTN 0x00000020 1348#define BGE_RDMAMODE_PCI_ADDROFLOW_ATTN 0x00000020
1349#define BGE_RDMAMODE_PCI_FIFOOFLOW_ATTN 0x00000040 1349#define BGE_RDMAMODE_PCI_FIFOOFLOW_ATTN 0x00000040
1350#define BGE_RDMAMODE_PCI_FIFOUFLOW_ATTN 0x00000080 1350#define BGE_RDMAMODE_PCI_FIFOUFLOW_ATTN 0x00000080
1351#define BGE_RDMAMODE_PCI_FIFOOREAD_ATTN 0x00000100 1351#define BGE_RDMAMODE_PCI_FIFOOREAD_ATTN 0x00000100
1352#define BGE_RDMAMODE_LOCWRITE_TOOBIG 0x00000200 1352#define BGE_RDMAMODE_LOCWRITE_TOOBIG 0x00000200
1353#define BGE_RDMAMODE_ALL_ATTNS 0x000003FC 1353#define BGE_RDMAMODE_ALL_ATTNS 0x000003FC
1354 1354
1355/* Alternate encodings for PCI-Express, from Broadcom-supplied Linux driver */ 1355/* Alternate encodings for PCI-Express, from Broadcom-supplied Linux driver */
1356#define BGE_RDMA_MODE_FIFO_LONG_BURST ((1<<17) || (1 << 16)) 1356#define BGE_RDMA_MODE_FIFO_LONG_BURST ((1<<17) | (1 << 16))
1357#define BGE_RDMA_MODE_FIFO_SIZE_128 (1 << 17) 1357#define BGE_RDMA_MODE_FIFO_SIZE_128 (1 << 17)
1358 1358
1359/* Read DMA status register */ 1359/* Read DMA status register */
1360#define BGE_RDMASTAT_PCI_TGT_ABRT_ATTN 0x00000004 1360#define BGE_RDMASTAT_PCI_TGT_ABRT_ATTN 0x00000004
1361#define BGE_RDMASTAT_PCI_MSTR_ABRT_ATTN 0x00000008 1361#define BGE_RDMASTAT_PCI_MSTR_ABRT_ATTN 0x00000008
1362#define BGE_RDMASTAT_PCI_PERR_ATTN 0x00000010 1362#define BGE_RDMASTAT_PCI_PERR_ATTN 0x00000010
1363#define BGE_RDMASTAT_PCI_ADDROFLOW_ATTN 0x00000020 1363#define BGE_RDMASTAT_PCI_ADDROFLOW_ATTN 0x00000020
1364#define BGE_RDMASTAT_PCI_FIFOOFLOW_ATTN 0x00000040 1364#define BGE_RDMASTAT_PCI_FIFOOFLOW_ATTN 0x00000040
1365#define BGE_RDMASTAT_PCI_FIFOUFLOW_ATTN 0x00000080 1365#define BGE_RDMASTAT_PCI_FIFOUFLOW_ATTN 0x00000080
1366#define BGE_RDMASTAT_PCI_FIFOOREAD_ATTN 0x00000100 1366#define BGE_RDMASTAT_PCI_FIFOOREAD_ATTN 0x00000100
1367#define BGE_RDMASTAT_LOCWRITE_TOOBIG 0x00000200 1367#define BGE_RDMASTAT_LOCWRITE_TOOBIG 0x00000200
1368 1368
1369/* 1369/*