Commit 344547093274c8bdb87becb939e5c8ab009ebfe6
Committed by
Jeff Garzik
Jeff Garzik
1 parent
0c0abbc580
Exists in
master
and in
7 other branches
[PATCH] SAA9730: Add missing header bits.
This header file patch was missing from the recent SAA9730 patch. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Showing 1 changed file with 25 additions and 11 deletions Side-by-side Diff
drivers/net/saa9730.h
| 1 | 1 | /* |
| 2 | - * Carsten Langgaard, carstenl@mips.com | |
| 3 | - * Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved. | |
| 2 | + * Copyright (C) 2000, 2005 MIPS Technologies, Inc. All rights reserved. | |
| 3 | + * Authors: Carsten Langgaard <carstenl@mips.com> | |
| 4 | + * Maciej W. Rozycki <macro@mips.com> | |
| 4 | 5 | * |
| 5 | 6 | * ######################################################################## |
| 6 | 7 | * |
| ... | ... | @@ -265,6 +266,7 @@ |
| 265 | 266 | |
| 266 | 267 | /* The SAA9730 (LAN) controller register map, as seen via the PCI-bus. */ |
| 267 | 268 | #define SAA9730_LAN_REGS_ADDR 0x20400 |
| 269 | +#define SAA9730_LAN_REGS_SIZE 0x00400 | |
| 268 | 270 | |
| 269 | 271 | struct lan_saa9730_regmap { |
| 270 | 272 | volatile unsigned int TxBuffA; /* 0x20400 */ |
| ... | ... | @@ -309,6 +311,7 @@ |
| 309 | 311 | |
| 310 | 312 | /* The SAA9730 (EVM) controller register map, as seen via the PCI-bus. */ |
| 311 | 313 | #define SAA9730_EVM_REGS_ADDR 0x02000 |
| 314 | +#define SAA9730_EVM_REGS_SIZE 0x00400 | |
| 312 | 315 | |
| 313 | 316 | struct evm_saa9730_regmap { |
| 314 | 317 | volatile unsigned int InterruptStatus1; /* 0x2000 */ |
| 315 | 318 | |
| 316 | 319 | |
| ... | ... | @@ -329,16 +332,32 @@ |
| 329 | 332 | |
| 330 | 333 | |
| 331 | 334 | struct lan_saa9730_private { |
| 335 | + /* | |
| 336 | + * Rx/Tx packet buffers. | |
| 337 | + * The Rx and Tx packets must be PACKET_SIZE aligned. | |
| 338 | + */ | |
| 339 | + void *buffer_start; | |
| 340 | + unsigned int buffer_size; | |
| 341 | + | |
| 342 | + /* | |
| 343 | + * DMA address of beginning of this object, returned | |
| 344 | + * by pci_alloc_consistent(). | |
| 345 | + */ | |
| 346 | + dma_addr_t dma_addr; | |
| 347 | + | |
| 348 | + /* Pointer to the associated pci device structure */ | |
| 349 | + struct pci_dev *pci_dev; | |
| 350 | + | |
| 332 | 351 | /* Pointer for the SAA9730 LAN controller register set. */ |
| 333 | 352 | t_lan_saa9730_regmap *lan_saa9730_regs; |
| 334 | 353 | |
| 335 | 354 | /* Pointer to the SAA9730 EVM register. */ |
| 336 | 355 | t_evm_saa9730_regmap *evm_saa9730_regs; |
| 337 | 356 | |
| 338 | - /* TRUE if the next buffer to write is RxBuffA, FALSE if RxBuffB. */ | |
| 339 | - unsigned char NextRcvToUseIsA; | |
| 340 | 357 | /* Rcv buffer Index. */ |
| 341 | 358 | unsigned char NextRcvPacketIndex; |
| 359 | + /* Next buffer index. */ | |
| 360 | + unsigned char NextRcvBufferIndex; | |
| 342 | 361 | |
| 343 | 362 | /* Index of next packet to use in that buffer. */ |
| 344 | 363 | unsigned char NextTxmPacketIndex; |
| ... | ... | @@ -353,13 +372,8 @@ |
| 353 | 372 | unsigned char DmaRcvPackets; |
| 354 | 373 | unsigned char DmaTxmPackets; |
| 355 | 374 | |
| 356 | - unsigned char RcvAIndex; /* index into RcvBufferSpace[] for Blk A */ | |
| 357 | - unsigned char RcvBIndex; /* index into RcvBufferSpace[] for Blk B */ | |
| 358 | - | |
| 359 | - unsigned int | |
| 360 | - TxmBuffer[LAN_SAA9730_BUFFERS][LAN_SAA9730_TXM_Q_SIZE]; | |
| 361 | - unsigned int | |
| 362 | - RcvBuffer[LAN_SAA9730_BUFFERS][LAN_SAA9730_RCV_Q_SIZE]; | |
| 375 | + void *TxmBuffer[LAN_SAA9730_BUFFERS][LAN_SAA9730_TXM_Q_SIZE]; | |
| 376 | + void *RcvBuffer[LAN_SAA9730_BUFFERS][LAN_SAA9730_RCV_Q_SIZE]; | |
| 363 | 377 | unsigned int TxBufferFree[LAN_SAA9730_BUFFERS]; |
| 364 | 378 | |
| 365 | 379 | unsigned char PhysicalAddress[LAN_SAA9730_CAM_ENTRIES][6]; |