X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Fcommon%2Fpsw.c;h=1d24597a88a8c29db2b35cb79bc1a432ddc8dfd4;hb=fbbb71d6d8aa93bccc87b17408a89432e4b8161c;hp=09352adafc56f9487723e988adc22c170dca2e62;hpb=1eb382f72510d50b3636fb88c4bfaf17183672b6;p=emu8051.git

diff --git a/src/common/psw.c b/src/common/psw.c
index 09352ad..1d24597 100644
--- a/src/common/psw.c
+++ b/src/common/psw.c
@@ -3,19 +3,7 @@
  *
  * Copyright (C) 2013 Hugo Villeneuve <hugo@hugovil.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ * This file is released under the GPLv2
  */
 
 #include "common.h"
@@ -24,22 +12,22 @@
 
 /* Returns 0 or 1 */
 int
-psw_read_bit(int bit)
+psw_read_bit(unsigned int bit)
 {
-	return (memory_read8(INT_MEM_ID, _PSW_) >> bit) & 0x01;
+	return (mem_read8(INT_MEM_ID, _PSW_) >> bit) & 0x01;
 }
 
 void
-psw_write_bit(int bit, int val)
+psw_write_bit(unsigned int bit, int val)
 {
-	u_int8_t psw = memory_read8(INT_MEM_ID, _PSW_);
+	uint8_t psw = mem_read8(INT_MEM_ID, _PSW_);
 
 	if (val)
 		psw |= (1 << bit);  /* Set */
 	else
 		psw &= ~(1 << bit); /* Clear */
 
-	memory_write8(INT_MEM_ID, _PSW_, psw); /* Save updated value */
+	mem_write8(INT_MEM_ID, _PSW_, psw); /* Save updated value */
 }
 
 /* Returns 0 or 1 */
@@ -126,7 +114,7 @@ void
 psw_compute_parity_bit(void)
 {
 	int parity = 0;
-	uint8_t acc = memory_read8(INT_MEM_ID, _ACC_);
+	uint8_t acc = mem_read8(INT_MEM_ID, _ACC_);
 
 	while (acc) {
 		parity = !parity;