Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Ralf Baechle and committed by
Jeff Garzik
34454709 0c0abbc5

+25 -11
+25 -11
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 * ··· 266 265 267 266 /* The SAA9730 (LAN) controller register map, as seen via the PCI-bus. */ 268 267 #define SAA9730_LAN_REGS_ADDR 0x20400 268 + #define SAA9730_LAN_REGS_SIZE 0x00400 269 269 270 270 struct lan_saa9730_regmap { 271 271 volatile unsigned int TxBuffA; /* 0x20400 */ ··· 311 309 312 310 /* The SAA9730 (EVM) controller register map, as seen via the PCI-bus. */ 313 311 #define SAA9730_EVM_REGS_ADDR 0x02000 312 + #define SAA9730_EVM_REGS_SIZE 0x00400 314 313 315 314 struct evm_saa9730_regmap { 316 315 volatile unsigned int InterruptStatus1; /* 0x2000 */ ··· 332 329 333 330 334 331 struct lan_saa9730_private { 332 + /* 333 + * Rx/Tx packet buffers. 334 + * The Rx and Tx packets must be PACKET_SIZE aligned. 335 + */ 336 + void *buffer_start; 337 + unsigned int buffer_size; 338 + 339 + /* 340 + * DMA address of beginning of this object, returned 341 + * by pci_alloc_consistent(). 342 + */ 343 + dma_addr_t dma_addr; 344 + 345 + /* Pointer to the associated pci device structure */ 346 + struct pci_dev *pci_dev; 347 + 335 348 /* Pointer for the SAA9730 LAN controller register set. */ 336 349 t_lan_saa9730_regmap *lan_saa9730_regs; 337 350 338 351 /* Pointer to the SAA9730 EVM register. */ 339 352 t_evm_saa9730_regmap *evm_saa9730_regs; 340 353 341 - /* TRUE if the next buffer to write is RxBuffA, FALSE if RxBuffB. */ 342 - unsigned char NextRcvToUseIsA; 343 354 /* Rcv buffer Index. */ 344 355 unsigned char NextRcvPacketIndex; 356 + /* Next buffer index. */ 357 + unsigned char NextRcvBufferIndex; 345 358 346 359 /* Index of next packet to use in that buffer. */ 347 360 unsigned char NextTxmPacketIndex; ··· 372 353 unsigned char DmaRcvPackets; 373 354 unsigned char DmaTxmPackets; 374 355 375 - unsigned char RcvAIndex; /* index into RcvBufferSpace[] for Blk A */ 376 - unsigned char RcvBIndex; /* index into RcvBufferSpace[] for Blk B */ 377 - 378 - unsigned int 379 - TxmBuffer[LAN_SAA9730_BUFFERS][LAN_SAA9730_TXM_Q_SIZE]; 380 - unsigned int 381 - RcvBuffer[LAN_SAA9730_BUFFERS][LAN_SAA9730_RCV_Q_SIZE]; 356 + void *TxmBuffer[LAN_SAA9730_BUFFERS][LAN_SAA9730_TXM_Q_SIZE]; 357 + void *RcvBuffer[LAN_SAA9730_BUFFERS][LAN_SAA9730_RCV_Q_SIZE]; 382 358 unsigned int TxBufferFree[LAN_SAA9730_BUFFERS]; 383 359 384 360 unsigned char PhysicalAddress[LAN_SAA9730_CAM_ENTRIES][6];