From: ryuz <ryuz>
Date: Sun, 19 Aug 2007 10:22:39 +0000 (+0000)
Subject: (none)
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1cf47b086f8639ef17e14d7895ab2a0756bf1b1a;p=hos%2Fhos-v4a.git

(none)
---

diff --git a/aplfw/build/common/gmake/aplfwsrc.inc b/aplfw/build/common/gmake/aplfwsrc.inc
index bf245d0..02aeaa9 100755
--- a/aplfw/build/common/gmake/aplfwsrc.inc
+++ b/aplfw/build/common/gmake/aplfwsrc.inc
@@ -216,6 +216,20 @@ CSRCS         += $(PC16550_DIR)/pc16550drv_create.c					\
                  $(PC16550_DIR)/pc16550hal_getstatus.c
 
 
+# ARMUART (PL011)
+ARMUART_DIR    = $(APLFW_DIR)/driver/serial/arm
+SRC_DIRS      += $(ARMUART_DIR)
+CSRCS         += $(ARMUART_DIR)/armuartdrv_create.c					\
+                 $(ARMUART_DIR)/armuartdrv_delete.c					\
+                 $(ARMUART_DIR)/armuartdrv_open.c					\
+                 $(ARMUART_DIR)/armuartdrv_close.c					\
+                 $(ARMUART_DIR)/armuartdrv_iocontrol.c				\
+                 $(ARMUART_DIR)/armuartdrv_seek.c					\
+                 $(ARMUART_DIR)/armuartdrv_read.c					\
+                 $(ARMUART_DIR)/armuartdrv_write.c					\
+                 $(ARMUART_DIR)/armuartdrv_flush.c					\
+                 $(ARMUART_DIR)/armuartdrv_isr.c					\
+
 
 
 # --------------------------------------------------
@@ -256,4 +270,11 @@ SRC_DIRS      += $(KEYTEST_DIR)
 CSRCS         += $(KEYTEST_DIR)/keytest_main.c
 
 
+# Ether Snoopt
+ETHERSNOOP_DIR = $(APLFW_DIR)/application/netcmd/ethersnoop
+SRC_DIRS      += $(ETHERSNOOP_DIR)
+CSRCS         += $(ETHERSNOOP_DIR)/ethersnoop_main.c
+
+
+
 # end of file
diff --git a/aplfw/driver/serial/at91/at91usartdrv_open.c b/aplfw/driver/serial/at91/at91usartdrv_open.c
index 74d4b15..76c0d20 100755
--- a/aplfw/driver/serial/at91/at91usartdrv_open.c
+++ b/aplfw/driver/serial/at91/at91usartdrv_open.c
@@ -32,13 +32,16 @@ HANDLE At91UsartDrv_Open(C_DRVOBJ *pDrvObj, const char *pszPath, int iMode)
 	/* オープン処理 */
 	if ( self->iOpenCount++ == 0 )
 	{
+		AT91USART_REG_WRITE(self, AT91USART_US_CR,   0x0000010c);	/* reset */
+
+		AT91USART_REG_WRITE(self, AT91USART_US_BRGR, 0x00000034);
 		AT91USART_REG_WRITE(self, AT91USART_US_MR,   0x000008c0);	/* 8bit, non-paroty */
 		AT91USART_REG_WRITE(self, AT91USART_US_CR,   0x00000050);	/* enable */
-		AT91USART_REG_WRITE(self, AT91USART_US_BRGR, 0x00000034);
-
+		AT91USART_REG_WRITE(self, AT91USART_US_IER,  0x00000001);	/* 受信割り込み許可 */		
+		
 		SysInt_Enable(self->iIntNum);
 	}
-
+	
 	return (HANDLE)pChrFile;
 }
 
diff --git a/aplfw/driver/serial/at91/at91usartdrv_write.c b/aplfw/driver/serial/at91/at91usartdrv_write.c
index b17bdc0..6a96b06 100755
--- a/aplfw/driver/serial/at91/at91usartdrv_write.c
+++ b/aplfw/driver/serial/at91/at91usartdrv_write.c
@@ -51,7 +51,7 @@ FILE_SIZE At91UsartDrv_Write(C_DRVOBJ *pDrvObj, C_FILEOBJ *pFileObj, const void
 		AT91USART_REG_WRITE(self, AT91USART_US_THR, c);
 	}
 loop_end:
-
+	
 	/* クリティカルセクションを出る */
 	SysMtx_Unlock(self->hMtxSend);
 
diff --git a/aplfw/driver/tcpip/ipether/ipether_write.c b/aplfw/driver/tcpip/ipether/ipether_write.c
index 9256503..f538114 100755
--- a/aplfw/driver/tcpip/ipether/ipether_write.c
+++ b/aplfw/driver/tcpip/ipether/ipether_write.c
@@ -11,6 +11,7 @@
 
 #include <string.h>
 #include "ipether_local.h"
+#include "library/algorithm/ipchecksum/ipchecksum.h"
 
 
 /* IPパケット送信 */
@@ -22,6 +23,8 @@ FILE_SIZE IpEther_Write(C_DRVOBJ *pDrvObj, C_FILEOBJ *pFileObj, const void *pDat
 	unsigned char		*pubSendBuf;
 	unsigned char		ubMacAddr[6];
 	int					iPacketSize;
+	C_IPCHECKSUM		ics;
+	unsigned short		uhSum;
 	
 	/* upper cast */
 	self = (C_IPETHER *)pDrvObj;
@@ -69,9 +72,38 @@ FILE_SIZE IpEther_Write(C_DRVOBJ *pDrvObj, C_FILEOBJ *pFileObj, const void *pDat
 	pubSendBuf[12] = 0x08;
 	pubSendBuf[13] = 0x00;
 	
-	/* IPデータグラム */
+	
+	/* IPデータグラムコピー */
 	memcpy(&pubSendBuf[14], pubData, Size);
 	
+	/* データ長 */
+	pubSendBuf[14 + 2] = (unsigned char)((Size >> 8) & 0xff);	
+	pubSendBuf[14 + 3] = (unsigned char)((Size >> 0) & 0xff);
+	
+	/* フラグメント */
+	pubSendBuf[6] = 0x00;
+	pubSendBuf[7] = 0x00;
+	
+	/* IPチェックサム */
+	pubSendBuf[14 + 10] = 0x00;
+	pubSendBuf[14 + 11] = 0x00;
+			
+	/* 自IPアドレス */
+	pubSendBuf[14 + 12] = self->ubMyIpAddr[0];
+	pubSendBuf[14 + 13] = self->ubMyIpAddr[1];
+	pubSendBuf[14 + 14] = self->ubMyIpAddr[2];
+	pubSendBuf[14 + 15] = self->ubMyIpAddr[3];
+	
+	
+	/* IPヘッダ部のチェックサム計算 */
+	IpCheckSum_Create(&ics);
+	IpCheckSum_Update(&ics, &pubSendBuf[14], (pubSendBuf[14 + 0] & 0x0f) * 4);
+	uhSum = IpCheckSum_GetDigest(&ics);
+	IpCheckSum_Delete(&ics);
+	pubSendBuf[14 + 10] =uhSum / 256;
+	pubSendBuf[14 + 11] =uhSum % 256;
+	
+	
 	/* パディング */
 	iPacketSize = Size + 14;
 	while ( iPacketSize < 60 )
diff --git a/aplfw/driver/tcpip/tcpip/tcpip_create.c b/aplfw/driver/tcpip/tcpip/tcpip_create.c
index 30cae7c..df63eaa 100755
--- a/aplfw/driver/tcpip/tcpip/tcpip_create.c
+++ b/aplfw/driver/tcpip/tcpip/tcpip_create.c
@@ -16,15 +16,14 @@
 /* 仮想関数テーブル */
 static const T_DRVOBJ_METHODS TcpIp_Methods = 
 	{
-		0,
-/*		Tcpip_Delete,
+		Tcpip_Delete,
 		Tcpip_Open,
 		Tcpip_Close,
 		Tcpip_IoControl,
 		Tcpip_Seek,
 		Tcpip_Read,
 		Tcpip_Write,
-		Tcpip_Flush,*/
+		Tcpip_Flush,
 	};
 
 
@@ -32,8 +31,8 @@ static const T_DRVOBJ_METHODS TcpIp_Methods =
 void Tcpip_Create(C_TCPIP *self, HANDLE hIp)
 {
 	/* 親クラスコンストラクタ呼び出し */
-//	ChrDrv_Create(&self->ChrDrv, &IpEther_Methods);
-
+	ChrDrv_Create(&self->ChrDrv, &TcpIp_Methods);
+	
 	/* メンバ変数初期化 */
 	self->iOpenCount = 0;
 	self->hIp        = hIp;
diff --git a/aplfw/driver/tcpip/tcpip/tcpip_local.h b/aplfw/driver/tcpip/tcpip/tcpip_local.h
index 272526e..97b9fe6 100755
--- a/aplfw/driver/tcpip/tcpip/tcpip_local.h
+++ b/aplfw/driver/tcpip/tcpip/tcpip_local.h
@@ -14,6 +14,40 @@
 
 
 #include "tcpip.h"
+#include "system/file/chrfile.h"
+#include "library/container/stmbuf/stmbuf.h"
+
+
+#define TCP_FLAG_FIN			0x01
+#define TCP_FLAG_SYN			0x02
+#define TCP_FLAG_RST			0x04
+#define TCP_FLAG_PSH			0x08
+#define TCP_FLAG_ACK			0x10
+#define TCP_FLAG_URG			0x20
+
+
+#define TCPIPFILE_TYPE_TCP		6
+#define TCPIPFILE_TYPE_UDP		17
+
+#define TCPIPFILE_RECV_BUFSIZE	2048
+
+
+typedef struct c_tcpipfile
+{
+	C_CHRFILE			ChrFile;		/* キャラクタ型ファイルオブジェクトを継承 */
+
+	char				iType;
+	unsigned char		ubIpAddr[4];
+	unsigned short		uhPortNum;
+	
+	struct c_tcpipfile	*pNext;
+	struct c_tcpipfile	*pPrev;
+	
+	C_STREAMBUF			RecvBuf;
+	unsigned char		ubRecvBuf[TCPIPFILE_RECV_BUFSIZE];
+	
+} C_TCPIPFILE;
+
 
 
 #ifdef __cplusplus
@@ -28,7 +62,10 @@ FILE_SIZE Tcpip_Read(C_DRVOBJ *pDrvObj, C_FILEOBJ *pFileObj, void *pBuf, FILE_SI
 FILE_SIZE Tcpip_Write(C_DRVOBJ *pDrvObj, C_FILEOBJ *pFileObj, const void *pData, FILE_SIZE Size);
 FILE_ERR  Tcpip_Flush(C_DRVOBJ *pDrvObj, C_FILEOBJ *pFileObj);
 
-void      Tcpip_Recv(VPARAM Param);																			/* 受信プロセス */
+int       Tcpip_GetSendBuf(C_TCPIP *self, void **ppBuf);		/* IPデータグラム送信バッファ取得 */
+void      Tcpip_SendBuf(C_TCPIP *self, void **ppBuf);			/* IPデータグラムバッファ送信 */
+void      Tcpip_Recv(VPARAM Param);								/* IPパケット受信プロセス */
+
 
 #ifdef __cplusplus
 }
diff --git a/aplfw/driver/tcpip/tcpip/tcpip_recv.c b/aplfw/driver/tcpip/tcpip/tcpip_recv.c
index 855cb53..32f3d71 100755
--- a/aplfw/driver/tcpip/tcpip/tcpip_recv.c
+++ b/aplfw/driver/tcpip/tcpip/tcpip_recv.c
@@ -11,9 +11,93 @@
 
 #include <string.h>
 #include "tcpip_local.h"
+#include "library/algorithm/ipchecksum/ipchecksum.h"
 
 
-static void Tcpip_RecvIcmp(C_TCPIP *self, unsigned char *pubBuf, int iSize);
+
+void Tcpip_IcmpRecv(C_TCPIP *self, const unsigned char *pubBuf, int iSize);
+
+
+
+void Tcpip_TcpRecv(C_TCPIP *self, const unsigned char *pubBuf, int iSize)
+{
+	const unsigned char *pubRecvTcp;
+	unsigned short		uhMyPort;
+	unsigned short		uhYourPort;
+
+	pubRecvTcp = &pubBuf[20];
+	
+	uhYourPort = (pubRecvTcp[0] << 8) + pubRecvTcp[1];
+	uhMyPort   = (pubRecvTcp[2] << 8) + pubRecvTcp[3];
+	
+	if ( pubRecvTcp[13] == TCP_FLAG_SYN )
+	{
+		unsigned long	uwSeqNum;
+		unsigned char	*pubSendBuf;
+		unsigned char	*pubSendTcp;
+		C_IPCHECKSUM	ics;
+		
+		pubSendBuf = self->ubSendBuf;
+		pubSendTcp = &pubSendBuf[20];
+		
+		
+		/******** IPヘッダ ********/
+		
+		/* バージョン4, ヘッダ長 0x14 */
+		pubSendBuf[0] = 0x45;
+		
+		/* 優先度, サービスタイプ */	
+		pubSendBuf[1] = 0x00;
+		
+		/* データ長 */
+		pubSendBuf[2] = iSize / 256;
+		pubSendBuf[3] = iSize % 256;
+		
+		/* ID */
+		pubSendBuf[4] = self->uhPacketId / 256;
+		pubSendBuf[5] = self->uhPacketId % 256;
+		self->uhPacketId++;
+		
+		/* フラグメント */
+		pubSendBuf[6] = 0x00;
+		pubSendBuf[7] = 0x00;
+		
+		/* TTL */
+		pubSendBuf[8] = 0xff;
+		
+		/* プロトコル */
+		pubSendBuf[9] = 0x06;	/* TCP */
+		
+		/* 送信元IPアドレス */
+		memcpy(&pubSendBuf[12],  &pubBuf[16], 4);
+
+		/* 送信先IPアドレス */
+		memcpy(&pubSendBuf[16],  &pubBuf[12], 4);
+		
+		
+		
+		/******** TCP ********/
+		/*
+
+		pubSendTcp[0] = 0x00;
+
+		IP_SET_HALFWORD(&pubRecvTcp[0], uhMyPort);
+		IP_SET_HALFWORD(&pubRecvTcp[2], uhYourPort);
+		
+		uwSeqNum = IP_GET_WORD(&pubRecvTcp[4]);
+		IpCheckSum_Create(&ics);
+		IpCheckSum_Update(&ics, &pubSendBuf[20], iSize - 20);
+		uhSum = IpCheckSum_GetDigest(&ics);
+		IpCheckSum_Delete(&ics);
+		*/
+	}
+}
+
+
+void Tcpip_UdpRecv(C_TCPIP *self, const unsigned char *pubBuf, int iSize)
+{
+	
+}
 
 
 /* 受信プロセス */
@@ -31,7 +115,7 @@ void Tcpip_Recv(VPARAM Param)
 	for ( ; ; )
 	{
 		/* 受信 */
-		if ( (iSize = File_Read(self->hIp, pubRecvBuf, 2048)) < 10 )
+		if ( (iSize = File_Read(self->hIp, pubRecvBuf, 2048)) < 20 )
 		{
 			continue;
 		}
@@ -40,21 +124,32 @@ void Tcpip_Recv(VPARAM Param)
 		switch ( pubRecvBuf[9] )
 		{
 		case 0x01:	/* ICMP */
-			Tcpip_RecvIcmp(self, pubRecvBuf, iSize);
+			Tcpip_IcmpRecv(self, pubRecvBuf, iSize);
+			break;
+
+		case 0x06:	/* TCP */
+			Tcpip_TcpRecv(self, pubRecvBuf, iSize);
+			break;
+
+		case 0x11:	/* UDP */
+			Tcpip_UdpRecv(self, pubRecvBuf, iSize);
 			break;
 		}
 	}
 }
 
-void Tcpip_SetIpCheckSum(unsigned char *pubBuf);
 
-
-void Tcpip_RecvIcmp(C_TCPIP *self, unsigned char *pubBuf, int iSize)
+void Tcpip_IcmpRecv(C_TCPIP *self, const unsigned char *pubBuf, int iSize)
 {
+	C_IPCHECKSUM	ics;
+	unsigned short	uhSum;
 	unsigned char	*pubSendBuf;
 	
 	pubSendBuf = self->ubSendBuf;
 	
+	
+	/******** IPヘッダ ********/
+	
 	/* バージョン4, ヘッダ長 0x14 */
 	pubSendBuf[0] = 0x45;
 	
@@ -69,7 +164,7 @@ void Tcpip_RecvIcmp(C_TCPIP *self, unsigned char *pubBuf, int iSize)
 	pubSendBuf[4] = self->uhPacketId / 256;
 	pubSendBuf[5] = self->uhPacketId % 256;
 	self->uhPacketId++;
-
+	
 	/* フラグメント */
 	pubSendBuf[6] = 0x00;
 	pubSendBuf[7] = 0x00;
@@ -78,7 +173,7 @@ void Tcpip_RecvIcmp(C_TCPIP *self, unsigned char *pubBuf, int iSize)
 	pubSendBuf[8] = 0xff;
 	
 	/* プロトコル */
-	pubSendBuf[9] = 0x01;
+	pubSendBuf[9] = 0x01;	/* ICMP */
 	
 	/* 送信元IPアドレス */
 	memcpy(&pubSendBuf[12],  &pubBuf[16], 4);
@@ -86,6 +181,10 @@ void Tcpip_RecvIcmp(C_TCPIP *self, unsigned char *pubBuf, int iSize)
 	/* 送信先IPアドレス */
 	memcpy(&pubSendBuf[16],  &pubBuf[12], 4);
 	
+	
+	
+	/******** ICMP ********/
+	
 	/* タイプ */
 	pubSendBuf[20] = 0x00;
 
@@ -107,49 +206,18 @@ void Tcpip_RecvIcmp(C_TCPIP *self, unsigned char *pubBuf, int iSize)
 	/* データ */
 	memcpy(&pubSendBuf[28], &pubBuf[28], iSize - 28);
 	
-	{
-		unsigned long	uwSum;
-		int				i;
-	
-		uwSum = 0;
-		for ( i = 0; i < iSize - 20; i++ )
-		{
-			uwSum += (unsigned short)(pubSendBuf[20 + i*2]*256 + pubSendBuf[20 + i*2 + 1]);
-		}
-		uwSum  = (uwSum & 0xffff) + (uwSum >> 16);
-		uwSum  = (uwSum & 0xffff) + (uwSum >> 16);
-		uwSum  = (~uwSum & 0xffff);
-		
-		pubSendBuf[22] = ((uwSum >> 8) & 0xff);
-		pubSendBuf[23] = (uwSum & 0xff);
-	}
-	
-	Tcpip_SetIpCheckSum(pubSendBuf);
-	
-	File_Write(self->hIp, pubSendBuf, iSize);
-}
+	/* ICPM部のチェックサム計算 */
+	IpCheckSum_Create(&ics);
+	IpCheckSum_Update(&ics, &pubSendBuf[20], iSize - 20);
+	uhSum = IpCheckSum_GetDigest(&ics);
+	IpCheckSum_Delete(&ics);
 
-
-
-void Tcpip_SetIpCheckSum(unsigned char *pubBuf)
-{
-	unsigned long	uwSum;
-	int				i;
+	pubSendBuf[22] = uhSum / 256;
+	pubSendBuf[23] = uhSum % 256;
 	
-	pubBuf[10] = 0x00;
-	pubBuf[11] = 0x00;
 	
-	uwSum = 0;
-	for ( i = 0; i < 10; i++ )
-	{
-		uwSum += (unsigned short)(pubBuf[i*2]*256 + pubBuf[i*2 + 1]);
-	}
-	uwSum  = (uwSum & 0xffff) + (uwSum >> 16);
-	uwSum  = (uwSum & 0xffff) + (uwSum >> 16);
-	uwSum  = (~uwSum & 0xffff);
-	
-	pubBuf[10] = ((uwSum >> 8) & 0xff);
-	pubBuf[11] = (uwSum & 0xff);
+	/* 送信 */	
+	File_Write(self->hIp, pubSendBuf, iSize);
 }
 
 
diff --git a/aplfw/system/file/file_initialize.c b/aplfw/system/file/file_initialize.c
index 6f1616d..b64c103 100755
--- a/aplfw/system/file/file_initialize.c
+++ b/aplfw/system/file/file_initialize.c
@@ -10,6 +10,7 @@
 
 
 #include "file_local.h"
+#include "sysvol.h"
 
 
 C_FILE	 g_File;
diff --git a/cfgrtr/build/vc60/h4acfg.dsp b/cfgrtr/build/vc60/h4acfg.dsp
index 83c1eb6..ea622c4 100755
--- a/cfgrtr/build/vc60/h4acfg.dsp
+++ b/cfgrtr/build/vc60/h4acfg.dsp
@@ -1,21 +1,19 @@
 # Microsoft Developer Studio Project File - Name="h4acfg" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** •ÒW‚µ‚È‚¢‚Å‚­‚¾‚³‚¢ **
+# ** •ÿÿW‚ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ**
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
 CFG=h4acfg - Win32 Debug
-!MESSAGE ‚±‚ê‚Í—LŒø‚ÈÒ²¸Ì§²Ù‚Å‚Í‚ ‚è‚Ü‚¹‚ñB ‚±‚ÌÌßÛ¼Þª¸Ä‚ðËÞÙÄނ·‚邽‚ß‚É‚Í NMAKE ‚ðŽg—p‚µ‚Ä‚­‚¾‚³‚¢B
-!MESSAGE [Ò²¸Ì§²Ù‚Ì´¸½Îß°Ä] ºÏÝÄނðŽg—p‚µ‚ÄŽÀs‚µ‚Ä‚­‚¾‚³‚¢
-!MESSAGE 
+!MESSAGE ‚ÿÿÿÿÿÿLŒÿÿ”Љ¶–¥‰×‚ÿÿÿÿ ‚ÿÿÿÿÿÿÿÿB ‚ÿÿ–ÊàzŽÜ…¶ÿÿèɟג܂ÿÿÿÿÿÿÿÿÿÿÿÿNMAKE ‚ðŽg—p‚ÿÿÿÿÿÿÿÿÿÿÿÿB
+!MESSAGE [™°ŒÊ„Qÿÿ–²Œ»—݈Â] ÍŸcÿÿðŽg—p‚ÿÿĎÿÿs‚ÿÿÿÿÿÿÿÿÿÿÿÿ!MESSAGE 
 !MESSAGE NMAKE /f "h4acfg.mak".
 !MESSAGE 
-!MESSAGE NMAKE ‚ÌŽÀsŽž‚ɍ\¬‚ðŽw’è‚Å‚«‚Ü‚·
-!MESSAGE ºÏÝÄÞ ×²Ýã‚Åϸۂ̐ݒè‚ð’è‹`‚µ‚Ü‚·B—á:
+!MESSAGE NMAKE ‚ÌŽÿÿsŽž‚ÿÿ\ÿÿðŽw’ÿÿÿÿÿÿÿÿÿÿ!MESSAGE ÍŸcÿÿœQÿÿÿÿ“nŒÙ‚ÿÿÿÿÿÿÿÿÿÿ`‚ÿÿÿÿÿÿB—ÿÿ
 !MESSAGE 
 !MESSAGE NMAKE /f "h4acfg.mak" CFG="h4acfg - Win32 Debug"
 !MESSAGE 
-!MESSAGE ‘I‘ð‰Â”\‚ÈËÞÙÄÞ Ó°ÄÞ:
+!MESSAGE ‘I‘ÿÿÿÿ\‚”ÉŸ×’Ü šO’Ü:
 !MESSAGE 
 !MESSAGE "h4acfg - Win32 Release" ("Win32 (x86) Console Application" —p)
 !MESSAGE "h4acfg - Win32 Debug" ("Win32 (x86) Console Application" —p)
diff --git a/cfgrtr/build/vc60/h4acfg.dsw b/cfgrtr/build/vc60/h4acfg.dsw
index 8b20e73..d21714b 100755
--- a/cfgrtr/build/vc60/h4acfg.dsw
+++ b/cfgrtr/build/vc60/h4acfg.dsw
@@ -1,5 +1,5 @@
 Microsoft Developer Studio Workspace File, Format Version 6.00
-# Œx: ‚±‚ÌÜ°¸½Íß°½ ̧²Ù ‚ð•ÒW‚Ü‚½‚͍폜‚µ‚È‚¢‚Å‚­‚¾‚³‚¢!
+# Œx: ‚ÿÿ–Úˆ¶làOÿÿ–¥‰× ‚ÿÿÿÿW‚ÿÿÿÿÿÿÿÿœ‚ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
 
 ###############################################################################
 
diff --git a/kernel/build/win/win32/vc60/hosv4a.dsp b/kernel/build/win/win32/vc60/hosv4a.dsp
index a1f7354..f2a2f55 100755
--- a/kernel/build/win/win32/vc60/hosv4a.dsp
+++ b/kernel/build/win/win32/vc60/hosv4a.dsp
@@ -1,21 +1,19 @@
 # Microsoft Developer Studio Project File - Name="hosv4a" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** •ÒW‚µ‚È‚¢‚Å‚­‚¾‚³‚¢ **
+# ** •ÿÿW‚ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ**
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
 CFG=hosv4a - Win32 Debug
-!MESSAGE ‚±‚ê‚Í—LŒø‚ÈÒ²¸Ì§²Ù‚Å‚Í‚ ‚è‚Ü‚¹‚ñB ‚±‚ÌÌßÛ¼Þª¸Ä‚ðËÞÙÄނ·‚邽‚ß‚É‚Í NMAKE ‚ðŽg—p‚µ‚Ä‚­‚¾‚³‚¢B
-!MESSAGE [Ò²¸Ì§²Ù‚Ì´¸½Îß°Ä] ºÏÝÄނðŽg—p‚µ‚ÄŽÀs‚µ‚Ä‚­‚¾‚³‚¢
-!MESSAGE 
+!MESSAGE ‚ÿÿÿÿÿÿLŒÿÿ”Љ¶–¥‰×‚ÿÿÿÿ ‚ÿÿÿÿÿÿÿÿB ‚ÿÿ–ÊàzŽÜ…¶ÿÿèɟג܂ÿÿÿÿÿÿÿÿÿÿÿÿNMAKE ‚ðŽg—p‚ÿÿÿÿÿÿÿÿÿÿÿÿB
+!MESSAGE [™°ŒÊ„Qÿÿ–²Œ»—݈Â] ÍŸcÿÿðŽg—p‚ÿÿĎÿÿs‚ÿÿÿÿÿÿÿÿÿÿÿÿ!MESSAGE 
 !MESSAGE NMAKE /f "hosv4a.mak".
 !MESSAGE 
-!MESSAGE NMAKE ‚ÌŽÀsŽž‚ɍ\¬‚ðŽw’è‚Å‚«‚Ü‚·
-!MESSAGE ºÏÝÄÞ ×²Ýã‚Åϸۂ̐ݒè‚ð’è‹`‚µ‚Ü‚·B—á:
+!MESSAGE NMAKE ‚ÌŽÿÿsŽž‚ÿÿ\ÿÿðŽw’ÿÿÿÿÿÿÿÿÿÿ!MESSAGE ÍŸcÿÿœQÿÿÿÿ“nŒÙ‚ÿÿÿÿÿÿÿÿÿÿ`‚ÿÿÿÿÿÿB—ÿÿ
 !MESSAGE 
 !MESSAGE NMAKE /f "hosv4a.mak" CFG="hosv4a - Win32 Debug"
 !MESSAGE 
-!MESSAGE ‘I‘ð‰Â”\‚ÈËÞÙÄÞ Ó°ÄÞ:
+!MESSAGE ‘I‘ÿÿÿÿ\‚”ÉŸ×’Ü šO’Ü:
 !MESSAGE 
 !MESSAGE "hosv4a - Win32 Release" ("Win32 (x86) Static Library" —p)
 !MESSAGE "hosv4a - Win32 Debug" ("Win32 (x86) Static Library" —p)
diff --git a/kernel/build/win/win32/vc60/hosv4a.dsw b/kernel/build/win/win32/vc60/hosv4a.dsw
index 45b7d32..a7b747e 100755
--- a/kernel/build/win/win32/vc60/hosv4a.dsw
+++ b/kernel/build/win/win32/vc60/hosv4a.dsw
@@ -1,5 +1,5 @@
 Microsoft Developer Studio Workspace File, Format Version 6.00
-# Œx: ‚±‚ÌÜ°¸½Íß°½ ̧²Ù ‚ð•ÒW‚Ü‚½‚͍폜‚µ‚È‚¢‚Å‚­‚¾‚³‚¢!
+# Œx: ‚ÿÿ–Úˆ¶làOÿÿ–¥‰× ‚ÿÿÿÿW‚ÿÿÿÿÿÿÿÿœ‚ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
 
 ###############################################################################
 
diff --git a/kernel/source/arch/proc/arm/arm_v4t/armcc/kfiq_hdr.s b/kernel/source/arch/proc/arm/arm_v4t/armcc/kfiq_hdr.s
index 8d99293..2676da6 100755
--- a/kernel/source/arch/proc/arm/arm_v4t/armcc/kfiq_hdr.s
+++ b/kernel/source/arch/proc/arm/arm_v4t/armcc/kfiq_hdr.s
@@ -71,7 +71,7 @@ _kernel_fiq_hdr
 			; ---- 割込みマスク値復帰処理
 				ldr		r1, [sp, #4]							; spsr_fiq 値取り出し
 				and		r1, r1, #F_Bit:OR:I_Bit
-				cmp		r1, r3									; 旧imsk値と比較
+				cmp		r1, r3									; 旧imsk値と比較(IRQ処理前のFIQ発生をケアする)
 				bne		return_int								; 不一致なら終了処理スキップ
 				strb	r3, [r0, #ICTXCB_IMSK]					; マスク値復帰
 				
diff --git a/sample/sh/sh7144/shc/startup.src b/sample/sh/sh7144/shc/startup.src
index 3c25a77..eba20fe 100755
--- a/sample/sh/sh7144/shc/startup.src
+++ b/sample/sh/sh7144/shc/startup.src
@@ -8,7 +8,7 @@
 				.SECTION	P, CODE, ALIGN=4
 _ResetHandler:	
 				mov.l	addr_VECTTBL, r1
-				ldc		r1, VBR
+	;			ldc		r1, VBR
 				mov.l	addr_INITSCT, r0
 				jsr		@r0
 				nop
diff --git a/sample/win/win32/vc60/sample.dsp b/sample/win/win32/vc60/sample.dsp
index 32e4d09..30efba5 100755
--- a/sample/win/win32/vc60/sample.dsp
+++ b/sample/win/win32/vc60/sample.dsp
@@ -1,21 +1,19 @@
 # Microsoft Developer Studio Project File - Name="sample" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** •ÒW‚µ‚È‚¢‚Å‚­‚¾‚³‚¢ **
+# ** •ÿÿW‚ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ**
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
 CFG=sample - Win32 Debug
-!MESSAGE ‚±‚ê‚Í—LŒø‚ÈÒ²¸Ì§²Ù‚Å‚Í‚ ‚è‚Ü‚¹‚ñB ‚±‚ÌÌßÛ¼Þª¸Ä‚ðËÞÙÄނ·‚邽‚ß‚É‚Í NMAKE ‚ðŽg—p‚µ‚Ä‚­‚¾‚³‚¢B
-!MESSAGE [Ò²¸Ì§²Ù‚Ì´¸½Îß°Ä] ºÏÝÄނðŽg—p‚µ‚ÄŽÀs‚µ‚Ä‚­‚¾‚³‚¢
-!MESSAGE 
+!MESSAGE ‚ÿÿÿÿÿÿLŒÿÿ”Љ¶–¥‰×‚ÿÿÿÿ ‚ÿÿÿÿÿÿÿÿB ‚ÿÿ–ÊàzŽÜ…¶ÿÿèɟג܂ÿÿÿÿÿÿÿÿÿÿÿÿNMAKE ‚ðŽg—p‚ÿÿÿÿÿÿÿÿÿÿÿÿB
+!MESSAGE [™°ŒÊ„Qÿÿ–²Œ»—݈Â] ÍŸcÿÿðŽg—p‚ÿÿĎÿÿs‚ÿÿÿÿÿÿÿÿÿÿÿÿ!MESSAGE 
 !MESSAGE NMAKE /f "sample.mak".
 !MESSAGE 
-!MESSAGE NMAKE ‚ÌŽÀsŽž‚ɍ\¬‚ðŽw’è‚Å‚«‚Ü‚·
-!MESSAGE ºÏÝÄÞ ×²Ýã‚Åϸۂ̐ݒè‚ð’è‹`‚µ‚Ü‚·B—á:
+!MESSAGE NMAKE ‚ÌŽÿÿsŽž‚ÿÿ\ÿÿðŽw’ÿÿÿÿÿÿÿÿÿÿ!MESSAGE ÍŸcÿÿœQÿÿÿÿ“nŒÙ‚ÿÿÿÿÿÿÿÿÿÿ`‚ÿÿÿÿÿÿB—ÿÿ
 !MESSAGE 
 !MESSAGE NMAKE /f "sample.mak" CFG="sample - Win32 Debug"
 !MESSAGE 
-!MESSAGE ‘I‘ð‰Â”\‚ÈËÞÙÄÞ Ó°ÄÞ:
+!MESSAGE ‘I‘ÿÿÿÿ\‚”ÉŸ×’Ü šO’Ü:
 !MESSAGE 
 !MESSAGE "sample - Win32 Release" ("Win32 (x86) Console Application" —p)
 !MESSAGE "sample - Win32 Debug" ("Win32 (x86) Console Application" —p)
diff --git a/sample/win/win32/vc60/sample.dsw b/sample/win/win32/vc60/sample.dsw
index 6e8d891..aa625a5 100755
--- a/sample/win/win32/vc60/sample.dsw
+++ b/sample/win/win32/vc60/sample.dsw
@@ -1,5 +1,5 @@
 Microsoft Developer Studio Workspace File, Format Version 6.00
-# Œx: ‚±‚ÌÜ°¸½Íß°½ ̧²Ù ‚ð•ÒW‚Ü‚½‚͍폜‚µ‚È‚¢‚Å‚­‚¾‚³‚¢!
+# Œx: ‚ÿÿ–Úˆ¶làOÿÿ–¥‰× ‚ÿÿÿÿW‚ÿÿÿÿÿÿÿÿœ‚ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
 
 ###############################################################################
 
diff --git a/test/que/test_que.dsp b/test/que/test_que.dsp
index 30097b5..0cc40a3 100755
--- a/test/que/test_que.dsp
+++ b/test/que/test_que.dsp
@@ -1,21 +1,19 @@
 # Microsoft Developer Studio Project File - Name="test_que" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** •ÒW‚µ‚È‚¢‚Å‚­‚¾‚³‚¢ **
+# ** •ÿÿW‚ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ**
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
 CFG=test_que - Win32 Debug
-!MESSAGE ‚±‚ê‚Í—LŒø‚ÈÒ²¸Ì§²Ù‚Å‚Í‚ ‚è‚Ü‚¹‚ñB ‚±‚ÌÌßÛ¼Þª¸Ä‚ðËÞÙÄނ·‚邽‚ß‚É‚Í NMAKE ‚ðŽg—p‚µ‚Ä‚­‚¾‚³‚¢B
-!MESSAGE [Ò²¸Ì§²Ù‚Ì´¸½Îß°Ä] ºÏÝÄނðŽg—p‚µ‚ÄŽÀs‚µ‚Ä‚­‚¾‚³‚¢
-!MESSAGE 
+!MESSAGE ‚ÿÿÿÿÿÿLŒÿÿ”Љ¶–¥‰×‚ÿÿÿÿ ‚ÿÿÿÿÿÿÿÿB ‚ÿÿ–ÊàzŽÜ…¶ÿÿèɟג܂ÿÿÿÿÿÿÿÿÿÿÿÿNMAKE ‚ðŽg—p‚ÿÿÿÿÿÿÿÿÿÿÿÿB
+!MESSAGE [™°ŒÊ„Qÿÿ–²Œ»—݈Â] ÍŸcÿÿðŽg—p‚ÿÿĎÿÿs‚ÿÿÿÿÿÿÿÿÿÿÿÿ!MESSAGE 
 !MESSAGE NMAKE /f "test_que.mak".
 !MESSAGE 
-!MESSAGE NMAKE ‚ÌŽÀsŽž‚ɍ\¬‚ðŽw’è‚Å‚«‚Ü‚·
-!MESSAGE ºÏÝÄÞ ×²Ýã‚Åϸۂ̐ݒè‚ð’è‹`‚µ‚Ü‚·B—á:
+!MESSAGE NMAKE ‚ÌŽÿÿsŽž‚ÿÿ\ÿÿðŽw’ÿÿÿÿÿÿÿÿÿÿ!MESSAGE ÍŸcÿÿœQÿÿÿÿ“nŒÙ‚ÿÿÿÿÿÿÿÿÿÿ`‚ÿÿÿÿÿÿB—ÿÿ
 !MESSAGE 
 !MESSAGE NMAKE /f "test_que.mak" CFG="test_que - Win32 Debug"
 !MESSAGE 
-!MESSAGE ‘I‘ð‰Â”\‚ÈËÞÙÄÞ Ó°ÄÞ:
+!MESSAGE ‘I‘ÿÿÿÿ\‚”ÉŸ×’Ü šO’Ü:
 !MESSAGE 
 !MESSAGE "test_que - Win32 Release" ("Win32 (x86) Console Application" —p)
 !MESSAGE "test_que - Win32 Debug" ("Win32 (x86) Console Application" —p)
diff --git a/test/que/test_que.dsw b/test/que/test_que.dsw
index f55812e..422b6d8 100755
--- a/test/que/test_que.dsw
+++ b/test/que/test_que.dsw
@@ -1,5 +1,5 @@
 Microsoft Developer Studio Workspace File, Format Version 6.00
-# Œx: ‚±‚ÌÜ°¸½Íß°½ ̧²Ù ‚ð•ÒW‚Ü‚½‚͍폜‚µ‚È‚¢‚Å‚­‚¾‚³‚¢!
+# Œx: ‚ÿÿ–Úˆ¶làOÿÿ–¥‰× ‚ÿÿÿÿW‚ÿÿÿÿÿÿÿÿœ‚ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
 
 ###############################################################################
 
diff --git a/tools/cmtcnv/cmtcnv.dsp b/tools/cmtcnv/cmtcnv.dsp
index b6aba36..565ddff 100755
--- a/tools/cmtcnv/cmtcnv.dsp
+++ b/tools/cmtcnv/cmtcnv.dsp
@@ -1,21 +1,19 @@
 # Microsoft Developer Studio Project File - Name="cmtcnv" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** •ÒW‚µ‚È‚¢‚Å‚­‚¾‚³‚¢ **
+# ** •ÿÿW‚ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ**
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
 CFG=cmtcnv - Win32 Debug
-!MESSAGE ‚±‚ê‚Í—LŒø‚ÈÒ²¸Ì§²Ù‚Å‚Í‚ ‚è‚Ü‚¹‚ñB ‚±‚ÌÌßÛ¼Þª¸Ä‚ðËÞÙÄނ·‚邽‚ß‚É‚Í NMAKE ‚ðŽg—p‚µ‚Ä‚­‚¾‚³‚¢B
-!MESSAGE [Ò²¸Ì§²Ù‚Ì´¸½Îß°Ä] ºÏÝÄނðŽg—p‚µ‚ÄŽÀs‚µ‚Ä‚­‚¾‚³‚¢
-!MESSAGE 
+!MESSAGE ‚ÿÿÿÿÿÿLŒÿÿ”Љ¶–¥‰×‚ÿÿÿÿ ‚ÿÿÿÿÿÿÿÿB ‚ÿÿ–ÊàzŽÜ…¶ÿÿèɟג܂ÿÿÿÿÿÿÿÿÿÿÿÿNMAKE ‚ðŽg—p‚ÿÿÿÿÿÿÿÿÿÿÿÿB
+!MESSAGE [™°ŒÊ„Qÿÿ–²Œ»—݈Â] ÍŸcÿÿðŽg—p‚ÿÿĎÿÿs‚ÿÿÿÿÿÿÿÿÿÿÿÿ!MESSAGE 
 !MESSAGE NMAKE /f "cmtcnv.mak".
 !MESSAGE 
-!MESSAGE NMAKE ‚ÌŽÀsŽž‚ɍ\¬‚ðŽw’è‚Å‚«‚Ü‚·
-!MESSAGE ºÏÝÄÞ ×²Ýã‚Åϸۂ̐ݒè‚ð’è‹`‚µ‚Ü‚·B—á:
+!MESSAGE NMAKE ‚ÌŽÿÿsŽž‚ÿÿ\ÿÿðŽw’ÿÿÿÿÿÿÿÿÿÿ!MESSAGE ÍŸcÿÿœQÿÿÿÿ“nŒÙ‚ÿÿÿÿÿÿÿÿÿÿ`‚ÿÿÿÿÿÿB—ÿÿ
 !MESSAGE 
 !MESSAGE NMAKE /f "cmtcnv.mak" CFG="cmtcnv - Win32 Debug"
 !MESSAGE 
-!MESSAGE ‘I‘ð‰Â”\‚ÈËÞÙÄÞ Ó°ÄÞ:
+!MESSAGE ‘I‘ÿÿÿÿ\‚”ÉŸ×’Ü šO’Ü:
 !MESSAGE 
 !MESSAGE "cmtcnv - Win32 Release" ("Win32 (x86) Console Application" —p)
 !MESSAGE "cmtcnv - Win32 Debug" ("Win32 (x86) Console Application" —p)
diff --git a/tools/cmtcnv/cmtcnv.dsw b/tools/cmtcnv/cmtcnv.dsw
index 51caa6b..c2a0f06 100755
--- a/tools/cmtcnv/cmtcnv.dsw
+++ b/tools/cmtcnv/cmtcnv.dsw
@@ -1,5 +1,5 @@
 Microsoft Developer Studio Workspace File, Format Version 6.00
-# Œx: ‚±‚ÌÜ°¸½Íß°½ ̧²Ù ‚ð•ÒW‚Ü‚½‚͍폜‚µ‚È‚¢‚Å‚­‚¾‚³‚¢!
+# Œx: ‚ÿÿ–Úˆ¶làOÿÿ–¥‰× ‚ÿÿÿÿW‚ÿÿÿÿÿÿÿÿœ‚ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
 
 ###############################################################################