deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

First implementation of cc2520 radio

Browse source 
Can write and read memory of radio chip. No communication with
merkur-board so far.
This commit is contained in:
Ralf Schlatterbeck 2016-05-08 16:49:54 +02:00
parent b9fc6a8324
commit cb1e085ebf
17 changed files with 646 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cpu/pico-rv32/Makefile.pico-rv32
View file

@ -3,7 +3,7 @@ CONTIKI_CPU_DIRS = . dev
### Define the CPU directory of the AVR port
CONTIKI_CPU=$(CONTIKI)/cpu/pico-rv32
PICORV32_SOURCES = mtarch.c rtimer-arch.c clock.c watchdog.c
PICORV32_SOURCES = mtarch.c rtimer-arch.c clock.c watchdog.c irq.c spi.c
CONTIKI_TARGET_SOURCEFILES += $(PICORV32_SOURCES) $(SENSORS) $(SYSAPPS) \
nullsec.c
@ -24,7 +24,7 @@ CFLAGSWERROR=-Werror
endif
CFLAGSNO = -Wall -march=RV32IXcustom -g \
-I$(CONTIKI)/platform/$(TARGET) \
-I. -I$(CONTIKI)/core -I$(CONTIKI_CPU)
-I. -I$(CONTIKI_CPU) -I$(CONTIKI)/core -fno-strict-aliasing
CFLAGS += $(CFLAGSNO) -Os
ifeq ($(HOST_OS),Darwin)

58
cpu/pico-rv32/dev/clock.c
View file

@ -69,15 +69,26 @@
#include "sys/etimer.h"
#include "icosoc.h"
#include <stdio.h> // FIXME
#include <stdio.h>
// 1/128 second ticks
#define CLOCK_TIMER_PERIOD (F_CPU >> 7)
static volatile clock_time_t count;
unsigned long offset;
void irq_handler(uint32_t irq_mask, uint32_t *regs);
/** \brief irq handler
* for running interrupts every 1/128 second.
*/
void
clock_irq_handler (void)
{
// FIXME: Want to call rtimer_run_next();
icosoc_timer(CLOCK_TIMER_PERIOD);
if(etimer_pending()) {
etimer_request_poll();
}
}
/*---------------------------------------------------------------------------*/
/**
@ -86,8 +97,8 @@ void irq_handler(uint32_t irq_mask, uint32_t *regs);
void
clock_init(void)
{
icosoc_irq(irq_handler);
icosoc_maskirq(0);
register_irq (TIMER_IRQ, clock_irq_handler);
enable_irq (TIMER_IRQ);
icosoc_timer(CLOCK_TIMER_PERIOD);
}
/*---------------------------------------------------------------------------*/
@ -98,7 +109,7 @@ clock_init(void)
clock_time_t
clock_time(void)
{
uint32_t low, high;
volatile uint32_t low, high;
asm ("1: rdcycleh %1\n"
"rdcycle %0\n"
"rdcycleh t0\n"
@ -145,6 +156,17 @@ clock_delay_usec(uint16_t dt)
clock_wait (CLOCK_SECOND * dt / 1000000ULL);
}
/*---------------------------------------------------------------------------*/
/**
* Legacy delay. The original clock_delay for the msp430 used a granularity
* of 2.83 usec. This approximates that delay for values up to 1456 usec.
* (The largest core call in leds.c uses 400).
*/
void
clock_delay(unsigned int howlong)
{
clock_delay_usec((45*howlong)>>4);
}
/*---------------------------------------------------------------------------*/
/**
* Adjust the system current clock time.
* \param howmany How many ticks to add
@ -158,29 +180,5 @@ clock_adjust_ticks(clock_time_t howmany)
{
}
/** \brief irq handler
* for running interrupts every 1/128 second.
*/
void
irq_handler(uint32_t irq_mask, uint32_t *regs)
{
// timer interrupt
if (irq_mask & 1) {
// FIXME: Want to call rtimer_run_next();
icosoc_timer(CLOCK_TIMER_PERIOD);
if(etimer_pending()) {
etimer_request_poll();
}
}
// SBREAK, ILLINS or BUSERROR
if (irq_mask & 4) {
printf("Bus Error!\n");
}
// Can we distinguish ILLINS and SBREAK?
if (irq_mask & 2) {
icosoc_sbreak();
}
}
/** @} */
/** @} */

2
cpu/pico-rv32/dev/spi.c Normal file
View file

@ -0,0 +1,2 @@
#include "spi.h"
uint8_t spi_rxbuf = 0;

85
cpu/pico-rv32/dev/spi.h Normal file
View file

@ -0,0 +1,85 @@
/*
* Copyright (c) 2016, Dr. Ralf Schlatterbeck Open Source Consulting
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* This file is part of the Contiki operating system.
*
*/
/**
* \brief This module contains PicoRV32-specific code to implement
* SPI routines
*
* \author Ralf Schlatterbeck <rsc@runtux.com>.
*
*/
/** \addtogroup picorv32
* @{
*/
/**
* \file
* SPI macros
*
*/
#ifndef SPI_H_
#define SPI_H_
#include "icosoc.h"
#define SPI_RXBUF spi_rxbuf
extern uint8_t spi_rxbuf;
/* Write one character to SPI */
#define SPI_WRITE(data) (spi_rxbuf = icosoc_cc2520_spi_xfer(data))
/* Currently no fast writing without waiting for transmission to
* terminate
*/
#define SPI_WRITE_FAST(data) SPI_WRITE(data)
/* Read one character from SPI */
#define SPI_READ(data) (data = spi_rxbuf = icosoc_cc2520_spi_xfer(0))
/* No async operation, therefore no flush */
#define SPI_FLUSH()
#define SPI_WAITFORTx_BEFORE()
#define SPI_WAITFORTx_AFTER() SPI_WAITFOREOTx()
#define SPI_WAITFORTx_ENDED()
#define SPI_WAITFORTxREADY()
#define BV(x) (1<<x)
/* Used by cc2520_init probably for disabling interrupts, don't need
* that here.
*/
#define splhigh() 1
#define splx(x) ((void)(x))
#endif /* SPI_H_ */
/** @} */

138
cpu/pico-rv32/irq.c Normal file
View file

@ -0,0 +1,138 @@
/*
* Copyright (c) 2016, Dr. Ralf Schlatterbeck Open Source Consulting
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* This file is part of the Contiki operating system.
*
*/
/**
* \brief This module contains PicoRV32-specific code to implement
* Interrupt handling for Timer and other interrupts
*
* \author Ralf Schlatterbeck <rsc@runtux.com>.
*
*/
/** \addtogroup picorv32
* @{
*/
/**
* \defgroup picorv32 irq implementation
* @{
*/
/**
* \file
* This file contains PicoRV32-specific code to implement
* Interrupt handling for Timer and other interrupts
*
*/
#include "irq.h"
#include <stdio.h>
#include <assert.h>
/* Initially allow bus-error and illegal instruction / sbreak */
static uint32_t irqmask = ~0x6;
/* Interrupt table, for convenience we waste some memory for the lower 3
* callbacks
*/
static void (*irq_callback_functions [MAXIRQ + 1])(void);
/** \brief irq handler
*/
void
irq_handler(uint32_t irq_mask, uint32_t *regs)
{
// Other interrupts
if (irq_mask & (((1 << (MAXIRQ + 2)) - 1) & ~0x6)) {
int i;
for (i=0; i<=MAXIRQ; i++) {
if (irq_mask & (1<<i)) {
if (i>0) {
printf ("irq: %d\n", i);
}
if (irq_callback_functions [i] == NULL) {
printf ("Ooops: IRQ without callback: %d\n", i);
} else {
irq_callback_functions [i] ();
}
}
}
}
// SBREAK, ILLINS or BUSERROR
if (irq_mask & 6) {
if (irq_mask & 4) {
if (irq_callback_functions [2]) {
irq_callback_functions [2] ();
} else {
printf("Bus Error!\n");
icosoc_sbreak();
}
}
if (irq_mask & 2) {
if (irq_callback_functions [1]) {
irq_callback_functions [1] ();
} else {
printf("Illegal Instruction or SBREAK!\n");
icosoc_sbreak();
}
}
}
}
void irq_init(void)
{
icosoc_irq(irq_handler);
icosoc_maskirq(irqmask);
}
void register_irq (int irq, void (*callback)(void))
{
printf ("register: %d\n", irq);
assert (irq <= MAXIRQ);
irq_callback_functions [irq] = callback;
}
void enable_irq (int irq)
{
printf ("enable: %d\n", irq);
assert (irq <= MAXIRQ);
if (irq_callback_functions [irq] != NULL) {
irqmask &= (~(1<<irq));
icosoc_maskirq(irqmask);
}
}
void disable_irq (int irq)
{
assert (irq <= MAXIRQ);
irqmask |= (1<<irq);
icosoc_maskirq(irqmask);
}
/** @} */
/** @} */

67
cpu/pico-rv32/irq.h Normal file
View file

@ -0,0 +1,67 @@
/*
* Copyright (c) 2016, Dr. Ralf Schlatterbeck Open Source Consulting
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* This file is part of the Contiki operating system.
*
*/
/**
* \brief This module contains PicoRV32-specific code to implement
* Interrupt handling for Timer and other interrupts
*
* \author Ralf Schlatterbeck <rsc@runtux.com>.
*
*/
/** \addtogroup picorv32
* @{
*/
/**
* \file
* Interrupt handling for Timer and other interrupts
*
*/
#ifndef IRQ_H_
#define IRQ_H_
#include "icosoc.h"
/* Want to set this higher if we have more than two external interrupts
* See used interrupts in icosoc.cfg. Don't set lower than 2 (2 is the
* bus-error interrupt)
*/
#define MAXIRQ 4
#define TIMER_IRQ 0
void irq_init (void);
void register_irq (int irq, void (*callback)(void));
void enable_irq (int irq);
void disable_irq (int irq);
#endif /* IRQ_H_ */
/** @} */