Skip to content

W
White Rabbit Switch - Software
Commit e24fbdd1 authored by Grzegorz Daniluk's avatar Grzegorz Daniluk Committed by Adam Wujek
Browse files
Options

kernel/wr_nic: add NIC_MEM_BASE definition instead of obsolete MEM from wbgen

parent 41b6e7c5
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
kernel/wr_nic/device.c
View file @ e24fbdd1
...@@ -139,7 +139,7 @@ static int wrn_probe(struct platform_device *pdev) ...@@ -139,7 +139,7 @@ static int wrn_probe(struct platform_device *pdev)
wrn->ppsg_regs = wrn->bases[WRN_FB_PPSG]; wrn->ppsg_regs = wrn->bases[WRN_FB_PPSG];
wrn->txd = ((void *)wrn->regs) + 0x80; /* was: TX1_D1 */ wrn->txd = ((void *)wrn->regs) + 0x80; /* was: TX1_D1 */
wrn->rxd = ((void *)wrn->regs) + 0x100; /* was: RX1_D1 */ wrn->rxd = ((void *)wrn->regs) + 0x100; /* was: RX1_D1 */
wrn->databuf = (void *)wrn->regs + offsetof(struct NIC_WB, MEM); wrn->databuf = (void *)wrn->regs + NIC_MEM_BASE;
tasklet_init(&wrn->rx_tlet, wrn_rx_interrupt, (unsigned long)wrn); tasklet_init(&wrn->rx_tlet, wrn_rx_interrupt, (unsigned long)wrn);
if (0) if (0)
printk("regs %p, txd %p, rxd %p, buffer %p\n", printk("regs %p, txd %p, rxd %p, buffer %p\n",
......
kernel/wr_nic/nic-mem.h
View file @ e24fbdd1
...@@ -11,6 +11,9 @@ ...@@ -11,6 +11,9 @@
#include "wr-nic.h" #include "wr-nic.h"
#include <asm/unaligned.h> #include <asm/unaligned.h>
#define NIC_MEM_BASE 0x8000 /* byte addressing of wb_in.adr(13) that in HDL
* selects between WB registers and nic_buffer */
/* Descriptor direction, used to locate descriptror data memory */ /* Descriptor direction, used to locate descriptror data memory */
enum wrn_ddir { enum wrn_ddir {
WRN_DDIR_RX, WRN_DDIR_RX,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment