OpenCores
URL https://opencores.org/ocsvn/s6soc/s6soc/trunk

Subversion Repositories s6soc

Compare Revisions

  • This comparison shows the changes necessary to convert path
    /s6soc
    from Rev 15 to Rev 14
    Reverse comparison

Rev 15 → Rev 14

/trunk/sw/dev/rtcsim.c File deleted
/trunk/sw/dev/rtcsim.h File deleted
/trunk/sw/dev/doorbell.c
4,7 → 4,7
//
// Project: CMod S6 System on a Chip, ZipCPU demonstration project
//
// Purpose: To test the PWM device by playing a doorbell sound every ten
// Purpose: To test the PWM device by playing a doorbell sound every five
// seconds.
//
// Creator: Dan Gisselquist, Ph.D.
/trunk/sw/dev/board.h
39,27 → 39,10
#ifndef BOARD_H
#define BOARD_H
 
// GPIO PINS
// first the outputs ...
#define GPO_SDA 0x000001
#define GPO_SCL 0x000002
#define GPO_MOSI 0x000004
#define GPO_SCK 0x000008
#define GPO_SS 0x000010
// then the inputs.
#define GPI_SDA 0x010000
#define GPI_SCL 0x020000
#define GPI_MISO 0x040000
 
#define GPOSETV(PINS) ((PINS)|((PINS)<<16))
#define GPOCLRV(PINS) ((PINS)<<16)
 
// Interrupts
#define INT_ENABLE 0x80000000
#define INT_BUTTON 0x001
#define INT_BUSERR 0x002 // Kind of useless, a buserr will kill us anyway
#define INT_SCOPE 0x004
#define INT_RTC 0x008 // May not be available, due to lack of space
#define INT_RTC 0x008
#define INT_TIMA 0x010
#define INT_TIMB 0x020
#define INT_UARTRX 0x040
67,10 → 50,7
#define INT_KEYPAD 0x100
#define INT_AUDIO 0x200
#define INT_GPIO 0x400
// #define INT_FLASH 0x800 // Not available due to lack of space
#define INT_ENABLEV(IN) (INT_ENABLE|((IN)<<16))
#define INT_DISABLEV(IN) (INT_ENABLE|((IN)<<16))
#define INT_CLEAR(IN) (IN)
// #define INT_FLASH 0x800
 
// Clocks per second, for use with the timer
#define TM_ONE_SECOND 80000000
/trunk/sw/dev/Makefile
60,11 → 60,9
 
# Not for build, for for building tags and dependency files, we need to know
# what the sources and headers are
DEVDRVR:= keypad.c display.c rtcsim.c
SOURCES:= helloworld.c doorbell.c doorbell2.c $(DEVDRVR)
SOURCES:= helloworld.c doorbell.c
HEADERS:= board.h
# OBJECTS:= $(addprefix $(OBJDIR)/,$(subst .cpp,.o,$(SOURCES)))
OBJDRVR := $(addprefix $(OBJDIR)/,$(subst .c,.o,$(DEVDRVR)))
 
 
CPPFLAGS := -I../zipos -I.
91,11 → 89,6
$(OBJDIR)/helloworld.txt: helloworld
$(OBJDUMP) -dr $^ > $@
 
doorbell2: $(OBJDIR)/ $(OBJDIR)/doorbell2.o $(OBJDRVR) cmod.ld
$(CC) $(LDFLAGS) $(OBJDIR)/doorbell2.o $(OBJDRVR) -o $@
$(OBJDIR)/doorbell2.txt: doorbell2
$(OBJDUMP) -dr $^ > $@
 
define build-depends
@echo "Building dependency file(s)"
$(CC) $(CPPFLAGS) -MM $(SOURCES) > $(OBJDIR)/xdep.txt

powered by: WebSVN 2.1.0

© copyright 1999-2024 OpenCores.org, equivalent to Oliscience, all rights reserved. OpenCores®, registered trademark.