diff options
Diffstat (limited to 'nuttx/arch/c5471/src')
-rw-r--r-- | nuttx/arch/c5471/src/Makefile | 11 | ||||
-rw-r--r-- | nuttx/arch/c5471/src/up_assert.c | 4 | ||||
-rw-r--r-- | nuttx/arch/c5471/src/up_createstack.c | 6 | ||||
-rw-r--r-- | nuttx/arch/c5471/src/up_schedulesigaction.c | 2 | ||||
-rw-r--r-- | nuttx/arch/c5471/src/up_serial.c | 8 | ||||
-rw-r--r-- | nuttx/arch/c5471/src/up_usestack.c | 6 |
6 files changed, 20 insertions, 17 deletions
diff --git a/nuttx/arch/c5471/src/Makefile b/nuttx/arch/c5471/src/Makefile index a4f953c6f..57d741aaa 100644 --- a/nuttx/arch/c5471/src/Makefile +++ b/nuttx/arch/c5471/src/Makefile @@ -56,7 +56,7 @@ COBJS = $(CSRCS:.c=.o) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -all: up_head.o libarch.a +all: up_head.o libarch$(LIBEXT) $(AOBJS) up_head.o: %.o: %.S $(CC) -c $(CFLAGS) -D__ASSEMBLY__ $< -o $@ @@ -64,8 +64,11 @@ $(AOBJS) up_head.o: %.o: %.S $(COBJS): %.o: %.c $(CC) -c $(CFLAGS) $< -o $@ -libarch.a: $(OBJS) - $(AR) rcs $@ $(OBJS) +libarch$(LIBEXT): $(OBJS) + ( for obj in $(OBJS) ; do \ + $(AR) $@ $${obj} || \ + { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ + done ; ) .depend: Makefile $(SRCS) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep @@ -74,7 +77,7 @@ libarch.a: $(OBJS) depend: .depend clean: - rm -f libarch.a *.o *~ + rm -f libarch$(LIBEXT) *.o *~ distclean: clean rm -f Make.dep .depend diff --git a/nuttx/arch/c5471/src/up_assert.c b/nuttx/arch/c5471/src/up_assert.c index eaddc7c8e..8b70349f4 100644 --- a/nuttx/arch/c5471/src/up_assert.c +++ b/nuttx/arch/c5471/src/up_assert.c @@ -63,7 +63,7 @@ * Name: up_assert ************************************************************/ -void up_assert(const ubyte *filename, uint32 lineno) +void up_assert(const ubyte *filename, int lineno) { dbg("Assertion failed at file:%s line: %d\n", filename, lineno); @@ -74,7 +74,7 @@ void up_assert(const ubyte *filename, uint32 lineno) * Name: up_assert_code ************************************************************/ -void up_assert_code(const ubyte *filename, uint32 lineno, uint16 errorcode) +void up_assert_code(const ubyte *filename, int lineno, int errorcode) { dbg("Assertion failed at file:%s line: %d error code: %d\n", filename, lineno, errorcode); diff --git a/nuttx/arch/c5471/src/up_createstack.c b/nuttx/arch/c5471/src/up_createstack.c index 90919e265..0e1f0690a 100644 --- a/nuttx/arch/c5471/src/up_createstack.c +++ b/nuttx/arch/c5471/src/up_createstack.c @@ -78,7 +78,7 @@ * must be allocated. ************************************************************/ -STATUS up_create_stack(_TCB *tcb, uint32 stack_size) +STATUS up_create_stack(_TCB *tcb, size_t stack_size) { if (tcb->stack_alloc_ptr && tcb->adj_stack_size != stack_size) @@ -94,8 +94,8 @@ STATUS up_create_stack(_TCB *tcb, uint32 stack_size) if (tcb->stack_alloc_ptr) { - uint32 top_of_stack; - uint32 size_of_stack; + size_t top_of_stack; + size_t size_of_stack; /* The Arm7Tdmi uses a push-down stack: the stack grows * toward loweraddresses in memory. The stack pointer diff --git a/nuttx/arch/c5471/src/up_schedulesigaction.c b/nuttx/arch/c5471/src/up_schedulesigaction.c index 4ea39bec2..3f4e32ec9 100644 --- a/nuttx/arch/c5471/src/up_schedulesigaction.c +++ b/nuttx/arch/c5471/src/up_schedulesigaction.c @@ -101,7 +101,7 @@ void up_schedule_sigaction(_TCB *tcb, sig_deliver_t sigdeliver) if (!tcb->xcp.sigdeliver) { - uint32 flags; + irqstate_t flags; /* Make sure that interrupts are disabled */ diff --git a/nuttx/arch/c5471/src/up_serial.c b/nuttx/arch/c5471/src/up_serial.c index df4927660..b11bfc070 100644 --- a/nuttx/arch/c5471/src/up_serial.c +++ b/nuttx/arch/c5471/src/up_serial.c @@ -721,7 +721,7 @@ static void up_uartsetup(up_dev_t *dev) static void shutdown(up_dev_t * dev) { - uint32 flags; + irqstate_t flags; uint16 msr; /* Free the IRQ */ @@ -878,7 +878,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) case TIOCSBRK: /* BSD compatibility: Turn break on, unconditionally */ { - uint32 flags = irqsave(); + irqstate_t flags = irqsave(); up_enablebreaks(dev); irqrestore(flags); } @@ -886,7 +886,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) case TIOCCBRK: /* BSD compatibility: Turn break off, unconditionally */ { - uint32 flags; + irqstate_t flags; flags = irqsave(); up_disablebreaks(dev); irqrestore(flags); @@ -973,7 +973,7 @@ static int up_open(struct file *filep) if (++dev->open_count == 1) { - int flags = irqsave(); + irqstate_t flags = irqsave(); /* If this is the console, then the UART has already * been initialized. diff --git a/nuttx/arch/c5471/src/up_usestack.c b/nuttx/arch/c5471/src/up_usestack.c index 4cab9209f..315314569 100644 --- a/nuttx/arch/c5471/src/up_usestack.c +++ b/nuttx/arch/c5471/src/up_usestack.c @@ -78,10 +78,10 @@ * ************************************************************/ -STATUS up_use_stack(_TCB *tcb, uint32 *stack, uint32 stack_size) +STATUS up_use_stack(_TCB *tcb, void *stack, size_t stack_size) { - uint32 top_of_stack; - uint32 size_of_stack; + size_t top_of_stack; + size_t size_of_stack; if (tcb->stack_alloc_ptr) { |