pl111.cc (9648:f10eb34e3e38) pl111.cc (9806:3f262c18ad5d)
1/*
2 * Copyright (c) 2010-2012 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 41 unchanged lines hidden (view full) ---

50#include "mem/packet.hh"
51#include "mem/packet_access.hh"
52#include "sim/system.hh"
53
54// clang complains about std::set being overloaded with Packet::set if
55// we open up the entire namespace std
56using std::vector;
57
1/*
2 * Copyright (c) 2010-2012 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 41 unchanged lines hidden (view full) ---

50#include "mem/packet.hh"
51#include "mem/packet_access.hh"
52#include "sim/system.hh"
53
54// clang complains about std::set being overloaded with Packet::set if
55// we open up the entire namespace std
56using std::vector;
57
58using namespace AmbaDev;
59
60// initialize clcd registers
61Pl111::Pl111(const Params *p)
62 : AmbaDmaDevice(p), lcdTiming0(0), lcdTiming1(0), lcdTiming2(0),
63 lcdTiming3(0), lcdUpbase(0), lcdLpbase(0), lcdControl(0), lcdImsc(0),
64 lcdRis(0), lcdMis(0),
65 clcdCrsrCtrl(0), clcdCrsrConfig(0), clcdCrsrPalette0(0),
66 clcdCrsrPalette1(0), clcdCrsrXY(0), clcdCrsrClip(0), clcdCrsrImsc(0),
67 clcdCrsrIcr(0), clcdCrsrRis(0), clcdCrsrMis(0),

--- 108 unchanged lines hidden (view full) ---

176 break;
177 case ClcdCrsrRis:
178 data = clcdCrsrRis;
179 break;
180 case ClcdCrsrMis:
181 data = clcdCrsrMis;
182 break;
183 default:
58// initialize clcd registers
59Pl111::Pl111(const Params *p)
60 : AmbaDmaDevice(p), lcdTiming0(0), lcdTiming1(0), lcdTiming2(0),
61 lcdTiming3(0), lcdUpbase(0), lcdLpbase(0), lcdControl(0), lcdImsc(0),
62 lcdRis(0), lcdMis(0),
63 clcdCrsrCtrl(0), clcdCrsrConfig(0), clcdCrsrPalette0(0),
64 clcdCrsrPalette1(0), clcdCrsrXY(0), clcdCrsrClip(0), clcdCrsrImsc(0),
65 clcdCrsrIcr(0), clcdCrsrRis(0), clcdCrsrMis(0),

--- 108 unchanged lines hidden (view full) ---

174 break;
175 case ClcdCrsrRis:
176 data = clcdCrsrRis;
177 break;
178 case ClcdCrsrMis:
179 data = clcdCrsrMis;
180 break;
181 default:
184 if (AmbaDev::readId(pkt, AMBA_ID, pioAddr)) {
182 if (readId(pkt, AMBA_ID, pioAddr)) {
185 // Hack for variable size accesses
186 data = pkt->get<uint32_t>();
187 break;
188 } else if (daddr >= CrsrImage && daddr <= 0xBFC) {
189 // CURSOR IMAGE
190 int index;
191 index = (daddr - CrsrImage) >> 2;
192 data= cursorImage[index];

--- 565 unchanged lines hidden --- 		183 // Hack for variable size accesses
184 data = pkt->get<uint32_t>();
185 break;
186 } else if (daddr >= CrsrImage && daddr <= 0xBFC) {
187 // CURSOR IMAGE
188 int index;
189 index = (daddr - CrsrImage) >> 2;
190 data= cursorImage[index];

--- 565 unchanged lines hidden ---