Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
49345103
K
Kernel
项目概览
openeuler
/
Kernel
大约 1 年 前同步成功
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
49345103
编写于
3月 29, 2007
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TULIP]: Use CONFIG_SPARC consistently in ifdef tests.
Signed-off-by:
N
David S. Miller
<
davem@davemloft.net
>
上级
49b6e95f
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
12 addition
and
16 deletion
+12
-16
drivers/net/tulip/de2104x.c
drivers/net/tulip/de2104x.c
+1
-1
drivers/net/tulip/de4x5.c
drivers/net/tulip/de4x5.c
+3
-7
drivers/net/tulip/tulip_core.c
drivers/net/tulip/tulip_core.c
+6
-6
drivers/net/tulip/winbond-840.c
drivers/net/tulip/winbond-840.c
+1
-1
drivers/net/tulip/xircom_tulip_cb.c
drivers/net/tulip/xircom_tulip_cb.c
+1
-1
未找到文件。
drivers/net/tulip/de2104x.c
浏览文件 @
49345103
...
...
@@ -63,7 +63,7 @@ MODULE_PARM_DESC (debug, "de2104x bitmapped message enable number");
/* Set the copy breakpoint for the copy-only-tiny-buffer Rx structure. */
#if defined(__alpha__) || defined(__arm__) || defined(__hppa__) \
|| defined(
__sparc__
) || defined(__ia64__) \
|| defined(
CONFIG_SPARC
) || defined(__ia64__) \
|| defined(__sh__) || defined(__mips__)
static
int
rx_copybreak
=
1518
;
#else
...
...
drivers/net/tulip/de4x5.c
浏览文件 @
49345103
...
...
@@ -1160,7 +1160,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
sprintf
(
lp
->
adapter_name
,
"%s (%s)"
,
name
,
gendev
->
bus_id
);
lp
->
dma_size
=
(
NUM_RX_DESC
+
NUM_TX_DESC
)
*
sizeof
(
struct
de4x5_desc
);
#if defined(__alpha__) || defined(__powerpc__) || defined(
__sparc_v9__
) || defined(DE4X5_DO_MEMCPY)
#if defined(__alpha__) || defined(__powerpc__) || defined(
CONFIG_SPARC
) || defined(DE4X5_DO_MEMCPY)
lp
->
dma_size
+=
RX_BUFF_SZ
*
NUM_RX_DESC
+
DE4X5_ALIGN
;
#endif
lp
->
rx_ring
=
dma_alloc_coherent
(
gendev
,
lp
->
dma_size
,
...
...
@@ -1175,7 +1175,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
** Set up the RX descriptor ring (Intels)
** Allocate contiguous receive buffers, long word aligned (Alphas)
*/
#if !defined(__alpha__) && !defined(__powerpc__) && !defined(
__sparc_v9__
) && !defined(DE4X5_DO_MEMCPY)
#if !defined(__alpha__) && !defined(__powerpc__) && !defined(
CONFIG_SPARC
) && !defined(DE4X5_DO_MEMCPY)
for
(
i
=
0
;
i
<
NUM_RX_DESC
;
i
++
)
{
lp
->
rx_ring
[
i
].
status
=
0
;
lp
->
rx_ring
[
i
].
des1
=
cpu_to_le32
(
RX_BUFF_SZ
);
...
...
@@ -1252,11 +1252,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
mii_get_phy
(
dev
);
}
#ifndef __sparc_v9__
printk
(
" and requires IRQ%d (provided by %s).
\n
"
,
dev
->
irq
,
#else
printk
(
" and requires IRQ%x (provided by %s).
\n
"
,
dev
->
irq
,
#endif
((
lp
->
bus
==
PCI
)
?
"PCI BIOS"
:
"EISA CNFG"
));
}
...
...
@@ -3627,7 +3623,7 @@ de4x5_alloc_rx_buff(struct net_device *dev, int index, int len)
struct
de4x5_private
*
lp
=
netdev_priv
(
dev
);
struct
sk_buff
*
p
;
#if !defined(__alpha__) && !defined(__powerpc__) && !defined(
__sparc_v9__
) && !defined(DE4X5_DO_MEMCPY)
#if !defined(__alpha__) && !defined(__powerpc__) && !defined(
CONFIG_SPARC
) && !defined(DE4X5_DO_MEMCPY)
struct
sk_buff
*
ret
;
u_long
i
=
0
,
tmp
;
...
...
drivers/net/tulip/tulip_core.c
浏览文件 @
49345103
...
...
@@ -36,7 +36,7 @@
#include <asm/unaligned.h>
#include <asm/uaccess.h>
#ifdef
__sparc__
#ifdef
CONFIG_SPARC
#include <asm/pbm.h>
#endif
...
...
@@ -67,7 +67,7 @@ const char * const medianame[32] = {
/* Set the copy breakpoint for the copy-only-tiny-buffer Rx structure. */
#if defined(__alpha__) || defined(__arm__) || defined(__hppa__) \
|| defined(
__sparc__
) || defined(__ia64__) \
|| defined(
CONFIG_SPARC
) || defined(__ia64__) \
|| defined(__sh__) || defined(__mips__)
static
int
rx_copybreak
=
1518
;
#else
...
...
@@ -91,7 +91,7 @@ static int rx_copybreak = 100;
static
int
csr0
=
0x01A00000
|
0xE000
;
#elif defined(__i386__) || defined(__powerpc__) || defined(__x86_64__)
static
int
csr0
=
0x01A00000
|
0x8000
;
#elif defined(
__sparc__
) || defined(__hppa__)
#elif defined(
CONFIG_SPARC
) || defined(__hppa__)
/* The UltraSparc PCI controllers will disconnect at every 64-byte
* crossing anyways so it makes no sense to tell Tulip to burst
* any more than that.
...
...
@@ -1315,7 +1315,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
/* DM9102A has troubles with MRM & clear reserved bits 24:22, 20, 16, 7:1 */
if
(
tulip_uli_dm_quirk
(
pdev
))
{
csr0
&=
~
0x01f100ff
;
#if defined(
__sparc__
)
#if defined(
CONFIG_SPARC
)
csr0
=
(
csr0
&
~
0xff00
)
|
0xe000
;
#endif
}
...
...
@@ -1535,14 +1535,14 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
Many PCI BIOSes also incorrectly report the IRQ line, so we correct
that here as well. */
if
(
sum
==
0
||
sum
==
6
*
0xff
)
{
#if defined(
__sparc__
)
#if defined(
CONFIG_SPARC
)
struct
pcidev_cookie
*
pcp
=
pdev
->
sysdata
;
#endif
eeprom_missing
=
1
;
for
(
i
=
0
;
i
<
5
;
i
++
)
dev
->
dev_addr
[
i
]
=
last_phys_addr
[
i
];
dev
->
dev_addr
[
i
]
=
last_phys_addr
[
i
]
+
1
;
#if defined(
__sparc__
)
#if defined(
CONFIG_SPARC
)
if
(
pcp
)
{
const
unsigned
char
*
addr
;
int
len
;
...
...
drivers/net/tulip/winbond-840.c
浏览文件 @
49345103
...
...
@@ -903,7 +903,7 @@ static void init_registers(struct net_device *dev)
}
#elif defined(__powerpc__) || defined(__i386__) || defined(__alpha__) || defined(__ia64__) || defined(__x86_64__)
i
|=
0xE000
;
#elif defined(
__sparc__
) || defined (CONFIG_PARISC)
#elif defined(
CONFIG_SPARC
) || defined (CONFIG_PARISC)
i
|=
0x4800
;
#else
#warning Processor architecture undefined
...
...
drivers/net/tulip/xircom_tulip_cb.c
浏览文件 @
49345103
...
...
@@ -65,7 +65,7 @@ static int rx_copybreak = 100;
static
int
csr0
=
0x01A00000
|
0xE000
;
#elif defined(__powerpc__)
static
int
csr0
=
0x01B00000
|
0x8000
;
#elif defined(
__sparc__
)
#elif defined(
CONFIG_SPARC
)
static
int
csr0
=
0x01B00080
|
0x8000
;
#elif defined(__i386__)
static
int
csr0
=
0x01A00000
|
0x8000
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录