christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

Merge branch 'hannesweisbach-fixes'

Browse Source
This commit is contained in:
Horst Schirmeier
2016-07-26 18:13:53 +02:00
parent 6509d50ec1 3fc3c6a689
commit 8a63533137
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/doxygen.cmake
View File

@ -16,7 +16,7 @@ file(MAKE_DIRECTORY ${FAIL_DOC_OUTPUT})
# means, the path to your FAIL* directory should not contain any blanks. # means, the path to your FAIL* directory should not contain any blanks.
configure_file(${PROJECT_SOURCE_DIR}/cmake/Doxyfile.in configure_file(${PROJECT_SOURCE_DIR}/cmake/Doxyfile.in
${PROJECT_BINARY_DIR}/Doxyfile @ONLY} ${PROJECT_BINARY_DIR}/Doxyfile @ONLY
) )
## call make doc to generate documentation ## call make doc to generate documentation

2
simulators/bochs/iodev/vga.cc
View File

@ -558,7 +558,7 @@ void bx_vga_c::determine_screen_dimensions(unsigned *piHeight, unsigned *piWidth
{ {
int ai[0x20]; int ai[0x20];
int i,h,v; int i,h,v;
for (i = 0 ; i < 0x20 ; i++) for (i = 0 ; i < 0x19 ; i++)
ai[i] = BX_VGA_THIS s.CRTC.reg[i]; ai[i] = BX_VGA_THIS s.CRTC.reg[i];
h = (ai[1] + 1) * 8; h = (ai[1] + 1) * 8;