Skip to content

Commit

Permalink
newlines at end of file
Browse files Browse the repository at this point in the history
  • Loading branch information
jriwanek committed Feb 19, 2022
1 parent 30e0c7f commit 4287e44
Show file tree
Hide file tree
Showing 86 changed files with 55 additions and 92 deletions.
10 changes: 5 additions & 5 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
All authors of this emulator are documented in at the top of each file in the source code.
They own portions of the code, or in cases, the entirety of it.
resid-fp and slirp folders have their own exceptions.
All authors of this emulator are documented in at the top of each file in the source code.

They own portions of the code, or in cases, the entirety of it.

resid-fp and slirp folders have their own exceptions.
2 changes: 1 addition & 1 deletion src/cdrom/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# Copyright 2020,2021 David Hrdlička.
#

add_library(cdrom OBJECT cdrom.c cdrom_image_backend.c cdrom_image.c)
add_library(cdrom OBJECT cdrom.c cdrom_image_backend.c cdrom_image.c)
2 changes: 1 addition & 1 deletion src/chipset/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ add_library(chipset OBJECT 82c100.c acc2168.c cs8230.c ali1429.c ali1489.c ali15

if(OLIVETTI)
target_sources(chipset PRIVATE olivetti_eva.c)
endif()
endif()
2 changes: 1 addition & 1 deletion src/chipset/sis_85c310.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,4 @@ const device_t rabbit_device = {
rabbit_init, rabbit_close, NULL,
{ NULL }, NULL, NULL,
NULL
};
};
2 changes: 1 addition & 1 deletion src/codegen/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ if(DYNAREC)
endif()

target_link_libraries(86Box dynarec cgt)
endif()
endif()
2 changes: 1 addition & 1 deletion src/codegen_new/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ if(DYNAREC)
endif()

target_link_libraries(86Box dynarec cgt)
endif()
endif()
2 changes: 1 addition & 1 deletion src/codegen_new/codegen_backend_arm.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ void host_arm_SUB_IMM(codeblock_t *block, int dst_reg, int src_reg, uint32_t imm
void host_arm_call(codeblock_t *block, void *dst_addr);
void host_arm_nop(codeblock_t *block);

void codegen_alloc(codeblock_t *block, int size);
void codegen_alloc(codeblock_t *block, int size);
2 changes: 1 addition & 1 deletion src/codegen_new/codegen_backend_arm64.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ void host_arm64_STRB_IMM_W(codeblock_t *block, int dest_reg, int base_reg, int o
void host_arm64_call(codeblock_t *block, void *dst_addr);
void host_arm64_mov_imm(codeblock_t *block, int reg, uint32_t imm_data);

uint32_t host_arm64_find_imm(uint32_t data);
uint32_t host_arm64_find_imm(uint32_t data);
2 changes: 1 addition & 1 deletion src/codegen_new/codegen_backend_arm64_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,4 +132,4 @@ extern void *codegen_fp_round;
extern void *codegen_fp_round_quad;

extern void *codegen_gpf_rout;
extern void *codegen_exit_rout;
extern void *codegen_exit_rout;
2 changes: 1 addition & 1 deletion src/codegen_new/codegen_backend_arm64_ops.h
Original file line number Diff line number Diff line change
Expand Up @@ -261,4 +261,4 @@ void host_arm64_mov_imm(codeblock_t *block, int reg, uint32_t imm_data);

void codegen_direct_read_8(codeblock_t *block, int host_reg, void *p);

void codegen_alloc(codeblock_t *block, int size);
void codegen_alloc(codeblock_t *block, int size);
1 change: 0 additions & 1 deletion src/cpu/x86_ops_arith.h
Original file line number Diff line number Diff line change
Expand Up @@ -825,4 +825,3 @@ static int op83_l_a32(uint32_t fetchdat)

return 0;
}

1 change: 0 additions & 1 deletion src/cpu/x86_ops_bitscan.h
Original file line number Diff line number Diff line change
Expand Up @@ -156,4 +156,3 @@ static int opBSR_l_a32(uint32_t fetchdat)
PREFETCH_RUN(instr_cycles, 2, rmdat, 0,(cpu_mod == 3) ? 0:1,0,0, 1);
return 0;
}

1 change: 0 additions & 1 deletion src/cpu/x86_ops_int.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,3 @@ static int opINTO(uint32_t fetchdat)
PREFETCH_RUN(3, 1, -1, 0,0,0,0, 0);
return 0;
}

1 change: 0 additions & 1 deletion src/cpu/x86_ops_jump.h
Original file line number Diff line number Diff line change
Expand Up @@ -378,4 +378,3 @@ static int opRET_l_imm(uint32_t fetchdat)
PREFETCH_FLUSH();
return 0;
}

2 changes: 1 addition & 1 deletion src/cpu/x86_ops_misc.h
Original file line number Diff line number Diff line change
Expand Up @@ -968,4 +968,4 @@ static int opRSM(uint32_t fetchdat)
cpu_state.pc = cpu_state.oldpc;
x86illegal();
return 1;
}
}
1 change: 0 additions & 1 deletion src/cpu/x86_ops_mov_ctrl.h
Original file line number Diff line number Diff line change
Expand Up @@ -366,4 +366,3 @@ static int opMOV_TRx_r_a32(uint32_t fetchdat)
PREFETCH_RUN(6, 2, rmdat, 0,0,0,0, 1);
return 0;
}

1 change: 0 additions & 1 deletion src/cpu/x86_ops_mul.h
Original file line number Diff line number Diff line change
Expand Up @@ -261,4 +261,3 @@ static int opIMUL_l_l_a32(uint32_t fetchdat)
PREFETCH_RUN(30, 2, rmdat, 0,1,0,0, 1);
return 0;
}

1 change: 0 additions & 1 deletion src/cpu/x86_ops_ret.h
Original file line number Diff line number Diff line change
Expand Up @@ -264,4 +264,3 @@ static int opIRETD(uint32_t fetchdat)
PREFETCH_FLUSH();
return cpu_state.abrt;
}

2 changes: 1 addition & 1 deletion src/cpu/x87_timings.c
Original file line number Diff line number Diff line change
Expand Up @@ -467,4 +467,4 @@ const x87_timings_t x87_concurrency_486 =
.fxtract = 4,
.fyl2x = 13,
.fyl2xp1 = 13,
};
};
2 changes: 1 addition & 1 deletion src/cpu/x87_timings.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ extern const x87_timings_t x87_timings_486;
extern const x87_timings_t x87_concurrency_486;

extern x87_timings_t x87_timings;
extern x87_timings_t x87_concurrency;
extern x87_timings_t x87_concurrency;
2 changes: 1 addition & 1 deletion src/disk/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ add_library(zip OBJECT zip.c)
add_library(mo OBJECT mo.c)

add_subdirectory(minivhd)
target_link_libraries(86Box minivhd)
target_link_libraries(86Box minivhd)
2 changes: 1 addition & 1 deletion src/disk/minivhd/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@

add_library(minivhd STATIC cwalk.c libxml2_encoding.c minivhd_convert.c
minivhd_create.c minivhd_io.c minivhd_manage.c minivhd_struct_rw.c
minivhd_util.c)
minivhd_util.c)
2 changes: 1 addition & 1 deletion src/disk/minivhd/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
2 changes: 1 addition & 1 deletion src/disk/minivhd/libxml2_encoding.c
Original file line number Diff line number Diff line change
Expand Up @@ -444,4 +444,4 @@ NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. */
THE SOFTWARE. */
2 changes: 1 addition & 1 deletion src/disk/minivhd/libxml2_encoding.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ int UTF16LEToUTF8(unsigned char* out, int *outlen, const unsigned char* inb, int
int UTF8ToUTF16LE(unsigned char* outb, int *outlen, const unsigned char* in, int *inlen);
int UTF16BEToUTF8(unsigned char* out, int *outlen, const unsigned char* inb, int *inlenb);
int UTF8ToUTF16BE(unsigned char* outb, int *outlen, const unsigned char* in, int *inlen);
#endif
#endif
2 changes: 1 addition & 1 deletion src/disk/minivhd/minivhd.h
Original file line number Diff line number Diff line change
Expand Up @@ -266,4 +266,4 @@ int mvhd_write_sectors(MVHDMeta* vhdm, uint32_t offset, int num_sectors, void* i
* \return the number of sectors that were not written, or zero
*/
int mvhd_format_sectors(MVHDMeta* vhdm, uint32_t offset, int num_sectors);
#endif
#endif
2 changes: 1 addition & 1 deletion src/disk/minivhd/minivhd_convert.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,4 @@ FILE* mvhd_convert_to_raw(const char* utf8_vhd_path, const char* utf8_raw_path,
mvhd_close(vhdm);
mvhd_fseeko64(raw_img, 0, SEEK_SET);
return raw_img;
}
}
2 changes: 1 addition & 1 deletion src/disk/minivhd/minivhd_create.c
Original file line number Diff line number Diff line change
Expand Up @@ -482,4 +482,4 @@ MVHDMeta* mvhd_create_ex(MVHDCreationOptions options, int* err) {
}

return NULL; /* Make the compiler happy */
}
}
2 changes: 1 addition & 1 deletion src/disk/minivhd/minivhd_create.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@

MVHDMeta* mvhd_create_fixed_raw(const char* path, FILE* raw_img, uint64_t size_in_bytes, MVHDGeom* geom, int* err, mvhd_progress_callback progress_callback);

#endif
#endif
2 changes: 1 addition & 1 deletion src/disk/minivhd/minivhd_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,4 @@ struct MVHDMeta {
} format_buffer;
};

#endif
#endif
2 changes: 1 addition & 1 deletion src/disk/minivhd/minivhd_io.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,4 +129,4 @@ int mvhd_sparse_diff_write(MVHDMeta* vhdm, uint32_t offset, int num_sectors, voi
*/
int mvhd_noop_write(MVHDMeta* vhdm, uint32_t offset, int num_sectors, void* in_buff);

#endif
#endif
2 changes: 1 addition & 1 deletion src/disk/minivhd/minivhd_manage.c
Original file line number Diff line number Diff line change
Expand Up @@ -532,4 +532,4 @@ int mvhd_format_sectors(MVHDMeta* vhdm, uint32_t offset, int num_sectors) {
}
vhdm->write_sectors(vhdm, offset, remain, vhdm->format_buffer.zero_data);
return 0;
}
}
2 changes: 1 addition & 1 deletion src/disk/minivhd/minivhd_struct_rw.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,4 +164,4 @@ void mvhd_header_to_buffer(MVHDSparseHeader* header, uint8_t* buffer) {
mvhd_next_struct_to_buffer(&header->par_loc_entry[i].plat_data_offset, sizeof header->par_loc_entry[i].plat_data_offset, true, &buff_ptr);
}
mvhd_next_struct_to_buffer(&header->reserved_2, sizeof header->reserved_2, false, &buff_ptr);
}
}
2 changes: 1 addition & 1 deletion src/disk/minivhd/minivhd_struct_rw.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ void mvhd_footer_to_buffer(MVHDFooter* footer, uint8_t* buffer);
*/
void mvhd_header_to_buffer(MVHDSparseHeader* header, uint8_t* buffer);

#endif
#endif
1 change: 0 additions & 1 deletion src/fifo8.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,3 @@ uint32_t fifo8_num_used(Fifo8 *fifo)
{
return fifo->num;
}

2 changes: 1 addition & 1 deletion src/floppy/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
#

add_library(fdd OBJECT fdd.c fdc.c fdc_magitronic.c fdc_pii15xb.c fdi2raw.c fdd_common.c
fdd_86f.c fdd_fdi.c fdd_imd.c fdd_img.c fdd_json.c fdd_mfm.c fdd_td0.c)
fdd_86f.c fdd_fdi.c fdd_imd.c fdd_img.c fdd_json.c fdd_mfm.c fdd_td0.c)
1 change: 0 additions & 1 deletion src/floppy/fdi2raw.c
Original file line number Diff line number Diff line change
Expand Up @@ -2209,4 +2209,3 @@ int fdi2raw_loadtrack (FDI *fdi, uae_u16 *mfmbuf, uae_u16 *tracktiming, int trac
}
return outlen;
}

1 change: 0 additions & 1 deletion src/floppy/lzf/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,3 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
Alternatively, the following files carry an additional notice that
explicitly allows relicensing under the GPLv2: lzf.c lzf.h lzfP.h lzf_c.c
lzf_d.c

2 changes: 0 additions & 2 deletions src/floppy/lzf/README
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,3 @@ DESCRIPTION
AUTHOR
This library was written by Marc Lehmann <schmorp@schmorp.de> (See also
http://software.schmorp.de/pkg/liblzf).


1 change: 0 additions & 1 deletion src/floppy/lzf/crc32.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,3 @@ static const u32 crc_32_tab[] =
#define crc32(crc,byte) (crc_32_tab[(u8)(crc) ^ (u8)(byte)] ^ ((crc) >> 8))

#endif

1 change: 0 additions & 1 deletion src/floppy/lzf/lzf.c
Original file line number Diff line number Diff line change
Expand Up @@ -534,4 +534,3 @@ main (int argc, char *argv[])

exit (rc ? 1 : 0);
}

1 change: 0 additions & 1 deletion src/floppy/lzf/lzf.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,3 @@ lzf_decompress (const void *const in_data, unsigned int in_len,
void *out_data, unsigned int out_len);

#endif

1 change: 0 additions & 1 deletion src/floppy/lzf/lzfP.h
Original file line number Diff line number Diff line change
Expand Up @@ -182,4 +182,3 @@ typedef LZF_HSLOT LZF_STATE[1 << (HLOG)];
#endif

#endif

1 change: 0 additions & 1 deletion src/floppy/lzf/lzf_c.c
Original file line number Diff line number Diff line change
Expand Up @@ -290,4 +290,3 @@ lzf_compress (const void *const in_data, unsigned int in_len,

return op - (u8 *)out_data;
}

1 change: 0 additions & 1 deletion src/floppy/lzf/lzf_d.c
Original file line number Diff line number Diff line change
Expand Up @@ -182,4 +182,3 @@ lzf_decompress (const void *const in_data, unsigned int in_len,

return op - (u8 *)out_data;
}

2 changes: 1 addition & 1 deletion src/game/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
#

add_library(game OBJECT gameport.c joystick_standard.c
joystick_ch_flightstick_pro.c joystick_sw_pad.c joystick_tm_fcs.c)
joystick_ch_flightstick_pro.c joystick_sw_pad.c joystick_tm_fcs.c)
2 changes: 1 addition & 1 deletion src/mac/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ set_target_properties(86Box
set(CMAKE_XCODE_ATTRIBUTE_OTHER_CODE_SIGN_FLAGS "-o linker-signed")
set(XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "YES")
set(XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-")
#set(XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_CURRENT_SOURCE_DIR}/mac/codesign/dev/app.entitlements)
#set(XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_CURRENT_SOURCE_DIR}/mac/codesign/dev/app.entitlements)
2 changes: 0 additions & 2 deletions src/mac/macOSXGlue.m
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,3 @@ void getDefaultROMPath(char* Path)
strcpy(Path,[appDirectory fileSystemRepresentation]);
// return appDirectory;
}


2 changes: 1 addition & 1 deletion src/machine/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ endif()

if(OPEN_AT)
target_compile_definitions(mch PRIVATE USE_OPEN_AT)
endif()
endif()
2 changes: 1 addition & 1 deletion src/machine/m_at_socket5.c
Original file line number Diff line number Diff line change
Expand Up @@ -410,4 +410,4 @@ machine_at_sq588_init(const machine_t *model)
device_add(&sst_flash_29ee010_device);

return ret;
}
}
1 change: 0 additions & 1 deletion src/machine/m_ps1.c
Original file line number Diff line number Diff line change
Expand Up @@ -371,4 +371,3 @@ machine_ps1_m2121_init(const machine_t *model)

return ret;
}

2 changes: 1 addition & 1 deletion src/machine/m_ps2_mca.c
Original file line number Diff line number Diff line change
Expand Up @@ -1462,4 +1462,4 @@ machine_ps2_model_80_axx_init(const machine_t *model)
ps2_mca_board_model_70_type34_init(0, 8);

return ret;
}
}
1 change: 0 additions & 1 deletion src/machine/m_xt_philips.c
Original file line number Diff line number Diff line change
Expand Up @@ -201,4 +201,3 @@ machine_xt_p3120_init(const machine_t *model)

return ret;
}

2 changes: 1 addition & 1 deletion src/machine/m_xt_zenith.c
Original file line number Diff line number Diff line change
Expand Up @@ -204,4 +204,4 @@ machine_xt_z159_init(const machine_t *model)
lpt1_init(0x278);

return ret;
}
}
2 changes: 1 addition & 1 deletion src/mem/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
#

add_library(mem OBJECT catalyst_flash.c i2c_eeprom.c intel_flash.c mem.c rom.c
smram.c spd.c sst_flash.c)
smram.c spd.c sst_flash.c)
1 change: 0 additions & 1 deletion src/minitrace/minitrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -562,4 +562,3 @@ void internal_mtr_raw_event_arg(const char *category, const char *name, char ph,
--events_in_progress;
pthread_mutex_unlock(&event_mutex);
}

2 changes: 1 addition & 1 deletion src/printer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# Copyright 2020,2021 David Hrdlička.
#

add_library(print OBJECT png.c prt_cpmap.c prt_escp.c prt_text.c prt_ps.c)
add_library(print OBJECT png.c prt_cpmap.c prt_escp.c prt_text.c prt_ps.c)
1 change: 0 additions & 1 deletion src/qt/qt_progsettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -193,4 +193,3 @@ void ProgSettings::on_pushButtonLanguage_released()
{
ui->comboBoxLanguage->setCurrentIndex(0);
}

1 change: 0 additions & 1 deletion src/qt/qt_settingsfloppycdrom.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -250,4 +250,3 @@ void SettingsFloppyCDROM::on_comboBoxChannel_activated(int) {
ui->comboBoxChannel->currentData().toUInt());
Harddrives::busTrackClass->device_track(1, DEV_CDROM, ui->tableViewCDROM->model()->data(i, Qt::UserRole).toInt(), ui->tableViewCDROM->model()->data(i, Qt::UserRole + 1).toInt());
}

1 change: 0 additions & 1 deletion src/qt/qt_settingsharddisks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -294,4 +294,3 @@ void SettingsHarddisks::on_pushButtonRemove_clicked() {
ui->pushButtonNew->setEnabled(true);
ui->pushButtonExisting->setEnabled(true);
}

1 change: 0 additions & 1 deletion src/qt/qt_settingsinput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -200,4 +200,3 @@ void SettingsInput::on_pushButtonJoystick3_clicked() {
void SettingsInput::on_pushButtonJoystick4_clicked() {
updateJoystickConfig(ui->comboBoxJoystick->currentData().toInt(), 3, this);
}

1 change: 0 additions & 1 deletion src/qt/qt_settingsnetwork.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -136,4 +136,3 @@ void SettingsNetwork::on_comboBoxPcap_currentIndexChanged(int index)

enableElements(ui);
}

1 change: 0 additions & 1 deletion src/qt/qt_settingsports.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,3 @@ void SettingsPorts::on_checkBoxParallel3_stateChanged(int state) {
void SettingsPorts::on_checkBoxParallel4_stateChanged(int state) {
ui->comboBoxLpt4->setEnabled(state == Qt::Checked);
}

1 change: 0 additions & 1 deletion src/qt/qt_soundgain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,3 @@ void SoundGain::on_SoundGain_rejected()
{
sound_gain = sound_gain_orig;
}

Loading

0 comments on commit 4287e44

Please sign in to comment.