← Back to branch summary

~ubuntu-branches/ubuntu/saucy/bochs/saucy-proposed

« back to all changes in this revision

Viewing changes to iodev/pcivga.h

  • Committer: Bazaar Package Importer
  • Author(s): David Futcher
  • Date: 2009-04-30 07:46:11 UTC
  • mfrom: (1.1.11 upstream) (4.1.7 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090430074611-6dih80a5mk2uvxhk
Tags: 2.3.7+20090416-1ubuntu1
https://launchpad.net/bugs/370427
* Merge from debian unstable (LP: #370427), remaining changes:
  - debian/patches/12_no-ssp.patch: Build bios with -fno-stack-protector
  - Add Replaces/Conflicts for bochsbios-qemu (<< 2.3.6-2)

Show diffs side-by-side

added added

removed removed

Lines of Context:
iodev/pcivga.h
1
1
/////////////////////////////////////////////////////////////////////////
2
 
// $Id: pcivga.h,v 1.7 2007/09/28 19:52:03 sshwarts Exp $
 
2
// $Id: pcivga.h,v 1.10 2009/04/10 11:10:32 vruppert Exp $
3
3
/////////////////////////////////////////////////////////////////////////
4
4
//
5
5
//  Copyright (C) 2002,2003  Mike Nordell
16
16
//
17
17
//  You should have received a copy of the GNU Lesser General Public
18
18
//  License along with this library; if not, write to the Free Software
19
 
//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 
19
//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
20
20
 
21
21
#ifndef BX_IODEV_PCIVGA_H
22
22
#define BX_IODEV_PCIVGA_H
34
34
  virtual void init(void);
35
35
  virtual void reset(unsigned type);
36
36
  virtual void register_state(void);
 
37
  virtual void after_restore_state(void);
37
38
 
38
39
  virtual Bit32u pci_read_handler(Bit8u address, unsigned io_len);
39
40
  virtual void   pci_write_handler(Bit8u address, Bit32u value, unsigned io_len);
40
41
 
41
42
private:
42
43
  struct {
 
44
    Bit32u base_address;
43
45
    Bit8u pci_conf[256];
44
46
  } s;
45
47
};