removed all tsunami dependence on tlaserreg.h (RTC defines) and
all but tlaser_node.cc dependence on tlaserreg.h dev/tsunami_io.cc: dev/tsunamireg.h: removed tlaserreg.h --HG-- extra : convert_revision : 148a5d79530e5ed721a49279f684a48041deed2b
This commit is contained in:
parent
c3aaf43c88
commit
da269014da
3 changed files with 56 additions and 28 deletions
44
dev/rtcreg.h
Normal file
44
dev/rtcreg.h
Normal file
|
@ -0,0 +1,44 @@
|
|||
|
||||
/*
|
||||
* Copyright (c) 2005 The Regents of The University of Michigan
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are
|
||||
* met: redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer;
|
||||
* 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;
|
||||
* neither the name of the copyright holders 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 COPYRIGHT HOLDERS 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 COPYRIGHT
|
||||
* OWNER 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.
|
||||
*/
|
||||
|
||||
#define RTC_SEC 0x00
|
||||
#define RTC_SEC_ALRM 0x01
|
||||
#define RTC_MIN 0x02
|
||||
#define RTC_MIN_ALRM 0x03
|
||||
#define RTC_HR 0x04
|
||||
#define RTC_HR_ALRM 0x05
|
||||
#define RTC_DOW 0x06
|
||||
#define RTC_DOM 0x07
|
||||
#define RTC_MON 0x08
|
||||
#define RTC_YEAR 0x09
|
||||
#define RTC_CNTRL_REGA 0x0A
|
||||
#define RTC_CNTRL_REGB 0x0B
|
||||
#define RTC_CNTRL_REGC 0x0C
|
||||
#define RTC_CNTRL_REGD 0x0D
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2004 The Regents of The University of Michigan
|
||||
* Copyright (c) 2004-2005 The Regents of The University of Michigan
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
@ -45,6 +45,7 @@
|
|||
#include "sim/builder.hh"
|
||||
#include "dev/tsunami_cchip.hh"
|
||||
#include "dev/tsunamireg.h"
|
||||
#include "dev/rtcreg.h"
|
||||
#include "mem/functional_mem/memory_control.hh"
|
||||
|
||||
using namespace std;
|
||||
|
@ -217,36 +218,36 @@ TsunamiIO::read(MemReqPtr &req, uint8_t *data)
|
|||
return No_Fault;
|
||||
case TSDEV_RTC_DATA:
|
||||
switch(RTCAddress) {
|
||||
case RTC_CONTROL_REGISTERA:
|
||||
case RTC_CNTRL_REGA:
|
||||
*(uint8_t*)data = uip << 7 | 0x26;
|
||||
uip = !uip;
|
||||
return No_Fault;
|
||||
case RTC_CONTROL_REGISTERB:
|
||||
case RTC_CNTRL_REGB:
|
||||
// DM and 24/12 and UIE
|
||||
*(uint8_t*)data = 0x46;
|
||||
return No_Fault;
|
||||
case RTC_CONTROL_REGISTERC:
|
||||
case RTC_CNTRL_REGC:
|
||||
// If we want to support RTC user access in linux
|
||||
// This won't work, but for now it's fine
|
||||
*(uint8_t*)data = 0x00;
|
||||
return No_Fault;
|
||||
case RTC_CONTROL_REGISTERD:
|
||||
case RTC_CNTRL_REGD:
|
||||
panic("RTC Control Register D not implemented");
|
||||
case RTC_SECOND:
|
||||
case RTC_SEC:
|
||||
*(uint8_t *)data = tm.tm_sec;
|
||||
return No_Fault;
|
||||
case RTC_MINUTE:
|
||||
case RTC_MIN:
|
||||
*(uint8_t *)data = tm.tm_min;
|
||||
return No_Fault;
|
||||
case RTC_HOUR:
|
||||
case RTC_HR:
|
||||
*(uint8_t *)data = tm.tm_hour;
|
||||
return No_Fault;
|
||||
case RTC_DAY_OF_WEEK:
|
||||
case RTC_DOW:
|
||||
*(uint8_t *)data = tm.tm_wday;
|
||||
return No_Fault;
|
||||
case RTC_DAY_OF_MONTH:
|
||||
case RTC_DOM:
|
||||
*(uint8_t *)data = tm.tm_mday;
|
||||
case RTC_MONTH:
|
||||
case RTC_MON:
|
||||
*(uint8_t *)data = tm.tm_mon + 1;
|
||||
return No_Fault;
|
||||
case RTC_YEAR:
|
||||
|
|
|
@ -122,23 +122,6 @@
|
|||
#define TSDEV_RTC_ADDR 0x70
|
||||
#define TSDEV_RTC_DATA 0x71
|
||||
|
||||
// RTC defines
|
||||
#define RTC_SECOND 0 // second of minute [0..59]
|
||||
#define RTC_SECOND_ALARM 1 // seconds to alarm
|
||||
#define RTC_MINUTE 2 // minute of hour [0..59]
|
||||
#define RTC_MINUTE_ALARM 3 // minutes to alarm
|
||||
#define RTC_HOUR 4 // hour of day [0..23]
|
||||
#define RTC_HOUR_ALARM 5 // hours to alarm
|
||||
#define RTC_DAY_OF_WEEK 6 // day of week [1..7]
|
||||
#define RTC_DAY_OF_MONTH 7 // day of month [1..31]
|
||||
#define RTC_MONTH 8 // month of year [1..12]
|
||||
#define RTC_YEAR 9 // year [00..99]
|
||||
#define RTC_CONTROL_REGISTERA 10 // control register A
|
||||
#define RTC_CONTROL_REGISTERB 11 // control register B
|
||||
#define RTC_CONTROL_REGISTERC 12 // control register C
|
||||
#define RTC_CONTROL_REGISTERD 13 // control register D
|
||||
#define RTC_REGNUMBER_RTC_CR1 0x6A // control register 1
|
||||
|
||||
#define PCHIP_PCI0_MEMORY ULL(0x00000000000)
|
||||
#define PCHIP_PCI0_IO ULL(0x001FC000000)
|
||||
#define TSUNAMI_UNCACHABLE_BIT ULL(0x80000000000)
|
||||
|
|
Loading…
Reference in a new issue