Skip to content

Commit

Permalink
Merge pull request #50 from kremi151/merge_cartridge_into_memory
Browse files Browse the repository at this point in the history
Merge cartridge into memory
  • Loading branch information
kremi151 authored Dec 28, 2020
2 parents 0ba3e85 + e3cfefb commit 1a0399e
Show file tree
Hide file tree
Showing 13 changed files with 326 additions and 382 deletions.
3 changes: 1 addition & 2 deletions core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ set(SOURCES
source/controllers/joypad_void.cpp
source/controllers/display_void.cpp
source/util/romsizes.cpp
source/cartridge/cartridge.cpp
source/memory/memory.cpp
source/cartridge/mbc1.cpp
source/cartridge/mbc2.cpp
Expand Down Expand Up @@ -64,7 +63,7 @@ set(HEADERS
source/util/romsizes.h
source/util/ramsizes.h
source/util/fs.h
source/cartridge/cartridge.h
source/cartridge/status.h
source/memory/memory.h
source/util/debug.h
source/util/testing.h
Expand Down
216 changes: 0 additions & 216 deletions core/source/cartridge/cartridge.cpp

This file was deleted.

77 changes: 0 additions & 77 deletions core/source/cartridge/cartridge.h

This file was deleted.

35 changes: 35 additions & 0 deletions core/source/cartridge/status.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/**
* Copyright 2020 Michel Kremer (kremi151)
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#ifndef FB_CORE_CARTRIDGE_STATUS_H
#define FB_CORE_CARTRIDGE_STATUS_H

namespace FunkyBoy {

enum CartridgeStatus {
NoROMLoaded,
ROMFileNotReadable,
ROMParseError,
ROMTooBig,
ROMSizeMismatch,
ROMUnsupportedMBC,
RAMSizeUnsupported,
Loaded
};

}

#endif //FB_CORE_CARTRIDGE_STATUS_H
Loading

0 comments on commit 1a0399e

Please sign in to comment.