minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 12:13:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

s3c24x0: Fix usb_ohci.c missing in Makefile

Browse Source 
and usb_ohci.c warning differ in signedness

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2007-11-18 18:36:11 +01:00 committed by Wolfgang Denk
parent 6073f61e07
commit 6bf4c686af
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/arm920t/s3c24x0/Makefile
View File

@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(SOC).a LIB = $(obj)lib$(SOC).a
COBJS = i2c.o interrupts.o serial.o speed.o \ COBJS = i2c.o interrupts.o serial.o speed.o \
usb.o usb.o usb_ohci.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))

14
cpu/arm920t/s3c24x0/usb_ohci.c
View File

@ -498,7 +498,7 @@ static int ep_link (ohci_t *ohci, ed_t *edi)
if (ohci->ed_controltail == NULL) { if (ohci->ed_controltail == NULL) {
writel (ed, &ohci->regs->ed_controlhead); writel (ed, &ohci->regs->ed_controlhead);
} else { } else {
ohci->ed_controltail->hwNextED = m32_swap (ed); ohci->ed_controltail->hwNextED = (__u32)m32_swap (ed);
} }
ed->ed_prev = ohci->ed_controltail; ed->ed_prev = ohci->ed_controltail;
if (!ohci->ed_controltail && !ohci->ed_rm_list[0] && if (!ohci->ed_controltail && !ohci->ed_rm_list[0] &&
@ -514,7 +514,7 @@ static int ep_link (ohci_t *ohci, ed_t *edi)
if (ohci->ed_bulktail == NULL) { if (ohci->ed_bulktail == NULL) {
writel (ed, &ohci->regs->ed_bulkhead); writel (ed, &ohci->regs->ed_bulkhead);
} else { } else {
ohci->ed_bulktail->hwNextED = m32_swap (ed); ohci->ed_bulktail->hwNextED = (__u32)m32_swap (ed);
} }
ed->ed_prev = ohci->ed_bulktail; ed->ed_prev = ohci->ed_bulktail;
if (!ohci->ed_bulktail && !ohci->ed_rm_list[0] && if (!ohci->ed_bulktail && !ohci->ed_rm_list[0] &&
@ -606,7 +606,7 @@ static ed_t * ep_add_ed (struct usb_device *usb_dev, unsigned long pipe)
ed->hwINFO = m32_swap (OHCI_ED_SKIP); /* skip ed */ ed->hwINFO = m32_swap (OHCI_ED_SKIP); /* skip ed */
/* dummy td; end of td list for ed */ /* dummy td; end of td list for ed */
td = td_alloc (usb_dev); td = td_alloc (usb_dev);
ed->hwTailP = m32_swap (td); ed->hwTailP = (__u32)m32_swap (td);
ed->hwHeadP = ed->hwTailP; ed->hwHeadP = ed->hwTailP;
ed->state = ED_UNLINK; ed->state = ED_UNLINK;
ed->type = usb_pipetype (pipe); ed->type = usb_pipetype (pipe);
@ -663,13 +663,13 @@ static void td_fill (ohci_t *ohci, unsigned int info,
if (!len) if (!len)
data = 0; data = 0;
td->hwINFO = m32_swap (info); td->hwINFO = (__u32)m32_swap (info);
td->hwCBP = m32_swap (data); td->hwCBP = (__u32)m32_swap (data);
if (data) if (data)
td->hwBE = m32_swap (data + len - 1); td->hwBE = (__u32)m32_swap (data + len - 1);
else else
td->hwBE = 0; td->hwBE = 0;
td->hwNextTD = m32_swap (td_pt); td->hwNextTD = (__u32)m32_swap (td_pt);
/* append to queue */ /* append to queue */
td->ed->hwTailP = td->hwNextTD; td->ed->hwTailP = td->hwNextTD;