Skip to content

Commit

Permalink
Refactor Win_ErrorMsg() to XcpHw_ErrorMsg()
Browse files Browse the repository at this point in the history
  • Loading branch information
@christoph2
christoph2 committed Jan 12, 2020
1 parent 2aaa2a3 commit 745ff04
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion examples/simwin/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void memimnfo(void * ptr)
GetSystemInfo(&si);
res = VirtualQuery(ptr, &info, sizeof(MEMORY_BASIC_INFORMATION));
if (!res) {
Win_ErrorMsg("memimnfo::VirtualQuery()", GetLastError());
XcpHw_ErrorMsg("memimnfo::VirtualQuery()", GetLastError());
} else {
printf("%p %p %d %08x %08x %08x\n", info.BaseAddress, info.AllocationBase, info.RegionSize / 1024,
info.AllocationProtect, info.Protect, info.Type);
Expand Down
14 changes: 7 additions & 7 deletions flsemu/flsemu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,17 +201,17 @@ static bool FlsEmu_Flush(uint8_t segmentIdx)
segment = FlsEmu_Config->segments[segmentIdx];

if (VirtualQuery(segment->persistentArray->mappingAddress, &info, sizeof(MEMORY_BASIC_INFORMATION)) == 0) {
Win_ErrorMsg("FlsEmu_Flush::VirtualQuery()", GetLastError());
XcpHw_ErrorMsg("FlsEmu_Flush::VirtualQuery()", GetLastError());
return FALSE;
}

if (!FlushViewOfFile(segment->persistentArray->mappingAddress, info.RegionSize)) {
Win_ErrorMsg("FlsEmu_Flush::FlushViewOfFile()", GetLastError());
XcpHw_ErrorMsg("FlsEmu_Flush::FlushViewOfFile()", GetLastError());
return FALSE;
}

if (!FlushFileBuffers(segment->persistentArray->fileHandle)) {
Win_ErrorMsg("FlsEmu_Flush::FlushFileBuffers()", GetLastError());
XcpHw_ErrorMsg("FlsEmu_Flush::FlushFileBuffers()", GetLastError());
return FALSE;
}

Expand Down Expand Up @@ -385,14 +385,14 @@ static bool FlsEmu_MapView(FlsEmu_SegmentType * config, uint32_t offset, uint32_

error = UnmapViewOfFile(config->persistentArray->mappingAddress);
if (error == 0UL) {
Win_ErrorMsg("FlsEmu_MapView::MapViewOfFile()", GetLastError());
XcpHw_ErrorMsg("FlsEmu_MapView::MapViewOfFile()", GetLastError());
CloseHandle(config->persistentArray->mappingHandle);
return FALSE;
}

config->persistentArray->mappingAddress = (void *)MapViewOfFile(config->persistentArray->mappingHandle, FILE_MAP_ALL_ACCESS, 0, offset, length);
if (config->persistentArray->mappingAddress == NULL) {
Win_ErrorMsg("FlsEmu_MapView::MapViewOfFile()", GetLastError());
XcpHw_ErrorMsg("FlsEmu_MapView::MapViewOfFile()", GetLastError());
CloseHandle(config->persistentArray->mappingHandle);
return FALSE;
}
Expand Down Expand Up @@ -490,7 +490,7 @@ static HANDLE OpenCreateFile(char const * fileName, bool create)
(LPSECURITY_ATTRIBUTES)NULL, dispoition, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, (HANDLE)NULL
);
if (handle == INVALID_HANDLE_VALUE) {
Win_ErrorMsg("OpenCreateFile::CreateFile()", GetLastError());
XcpHw_ErrorMsg("OpenCreateFile::CreateFile()", GetLastError());
}

return handle;
Expand All @@ -506,7 +506,7 @@ static bool CreateFileView(HANDLE handle, DWORD length, FlsEmu_HwFileViewType *
/* TODO: Refactor to function; s. FlsEmu_MapView() */
fileView->mappingAddress = (void *)MapViewOfFile(fileView->mappingHandle, FILE_MAP_ALL_ACCESS, 0, 0, length);
if (fileView->mappingAddress == NULL) {
Win_ErrorMsg("CreateFileView::MapViewOfFile()", GetLastError());
XcpHw_ErrorMsg("CreateFileView::MapViewOfFile()", GetLastError());
CloseHandle(fileView->mappingHandle);
return FALSE;
}
Expand Down
2 changes: 1 addition & 1 deletion inc/xcp_hw.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ typedef struct tagXcpHw_OptionsType {

void XcpHw_GetCommandLineOptions(XcpHw_OptionsType * options);

void Win_ErrorMsg(char * const function, int errorCode);
void XcpHw_ErrorMsg(char * const function, int errorCode);

#if XCP_ENABLE_EXTERN_C_GUARDS == XCP_ON
#if defined(__cplusplus)
Expand Down
10 changes: 5 additions & 5 deletions src/hw/win/hw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ void XcpHw_ReleaseLock(uint8_t lockIdx)
LeaveCriticalSection(&XcpHw_Locks[lockIdx]);
}

void Win_ErrorMsg(char * const fun, int errorCode)
void XcpHw_ErrorMsg(char * const fun, int errorCode)
{
char buffer[1024];

Expand Down Expand Up @@ -220,22 +220,22 @@ bool XcpHw_MainFunction(HANDLE * quit_event)

hStdin = GetStdHandle(STD_INPUT_HANDLE);
if (hStdin == INVALID_HANDLE_VALUE) {
Win_ErrorMsg("GetStdHandle", GetLastError());
XcpHw_ErrorMsg("GetStdHandle", GetLastError());
}

fdwMode = ENABLE_WINDOW_INPUT | ENABLE_MOUSE_INPUT;
if (!SetConsoleMode(hStdin, fdwMode)) {
Win_ErrorMsg("SetConsoleMode", GetLastError());
XcpHw_ErrorMsg("SetConsoleMode", GetLastError());
}

WaitForSingleObject(hStdin, 1000);

if (!GetNumberOfConsoleInputEvents (hStdin, &cNumRead)) {
Win_ErrorMsg("PeekConsoleInput", GetLastError());
XcpHw_ErrorMsg("PeekConsoleInput", GetLastError());
} else {
if (cNumRead) {
if (!ReadConsoleInput(hStdin, irInBuf, 128, &cNumRead)) {
Win_ErrorMsg("ReadConsoleInput", GetLastError());
XcpHw_ErrorMsg("ReadConsoleInput", GetLastError());
}
for (idx = 0; idx < cNumRead; ++idx) {
switch(irInBuf[idx].EventType) {
Expand Down
26 changes: 13 additions & 13 deletions src/tl/eth/wineth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
#define DEFAULT_SOCKTYPE SOCK_STREAM //
#define DEFAULT_PORT "5555"

void Win_ErrorMsg(char * const function, unsigned errorCode);
void XcpHw_ErrorMsg(char * const function, unsigned errorCode);


typedef struct tagXcpTl_ConnectionType {
Expand Down Expand Up @@ -132,7 +132,7 @@ void XcpTl_Init(void)
memset(&Hints, 0, sizeof(Hints));
GetSystemTimeAdjustment(&dwTimeAdjustment, &dwTimeIncrement, &fAdjustmentDisabled);
if (WSAStartup(MAKEWORD(2, 2), &wsa) != 0) {
Win_ErrorMsg("XcpTl_Init:WSAStartup()", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_Init:WSAStartup()", WSAGetLastError());
exit(EXIT_FAILURE);
} else {

Expand All @@ -143,7 +143,7 @@ void XcpTl_Init(void)
Hints.ai_flags = AI_NUMERICHOST | AI_PASSIVE;
ret = getaddrinfo(Address, Port, &Hints, &AddrInfo);
if (ret != 0) {
Win_ErrorMsg("XcpTl_Init::getaddrinfo()", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_Init::getaddrinfo()", WSAGetLastError());
WSACleanup();
return;
}
Expand All @@ -157,16 +157,16 @@ void XcpTl_Init(void)
}
serverSockets[idx] = socket(AI->ai_family, AI->ai_socktype, AI->ai_protocol);
if (serverSockets[idx] == INVALID_SOCKET){
Win_ErrorMsg("XcpTl_Init::socket()", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_Init::socket()", WSAGetLastError());
continue;
}
if (bind(serverSockets[idx], AI->ai_addr, AI->ai_addrlen) == SOCKET_ERROR) {
Win_ErrorMsg("XcpTl_Init::bind()", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_Init::bind()", WSAGetLastError());
continue;
}
if (XcpTl_Connection.socketType == SOCK_STREAM) {
if (listen(serverSockets[idx], 1) == SOCKET_ERROR) {
Win_ErrorMsg("XcpTl_Init::listen()", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_Init::listen()", WSAGetLastError());
continue;
}
}
Expand All @@ -185,7 +185,7 @@ void XcpTl_Init(void)
exit(2);
}
if (!Xcp_EnableSocketOption(XcpTl_Connection.boundSocket, SO_REUSEADDR)) {
Win_ErrorMsg("XcpTl_Init:setsockopt(SO_REUSEADDR)", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_Init:setsockopt(SO_REUSEADDR)", WSAGetLastError());
}
}

Expand Down Expand Up @@ -227,7 +227,7 @@ void XcpTl_RxHandler(void)
FromLen = sizeof(From);
XcpTl_Connection.connectedSocket = accept(XcpTl_Connection.boundSocket, (LPSOCKADDR)&XcpTl_Connection.currentAddress, &FromLen);
if (XcpTl_Connection.connectedSocket == INVALID_SOCKET) {
Win_ErrorMsg("XcpTl_RxHandler::accept()", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_RxHandler::accept()", WSAGetLastError());
//WSACleanup();
exit(1);
return;
Expand All @@ -243,7 +243,7 @@ void XcpTl_RxHandler(void)
}
recv_len = recv(XcpTl_Connection.connectedSocket, (char*)buf, XCP_COMM_BUFLEN, 0);
if (recv_len == SOCKET_ERROR) {
Win_ErrorMsg("XcpTl_RxHandler::recv()", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_RxHandler::recv()", WSAGetLastError());
closesocket(XcpTl_Connection.connectedSocket);
exit(1);
return;
Expand All @@ -260,7 +260,7 @@ void XcpTl_RxHandler(void)
);
if (recv_len == SOCKET_ERROR)
{
Win_ErrorMsg("XcpTl_RxHandler:recvfrom()", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_RxHandler:recvfrom()", WSAGetLastError());
fflush(stdout);
exit(1);
}
Expand Down Expand Up @@ -314,7 +314,7 @@ int16_t XcpTl_FrameAvailable(uint32_t sec, uint32_t usec)
if (((XcpTl_Connection.socketType == SOCK_STREAM) && (!XcpTl_Connection.connected)) || (XcpTl_Connection.socketType == SOCK_DGRAM)) {
res = select(0, &fds, 0, 0, &timeout);
if (res == SOCKET_ERROR) {
Win_ErrorMsg("XcpTl_FrameAvailable:select()", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_FrameAvailable:select()", WSAGetLastError());
exit(2);
}
return res;
Expand All @@ -329,11 +329,11 @@ void XcpTl_Send(uint8_t const * buf, uint16_t len)
if (XcpTl_Connection.socketType == SOCK_DGRAM) {
if (sendto(XcpTl_Connection.boundSocket, (char const *)buf, len, 0,
(SOCKADDR * )(SOCKADDR_STORAGE const *)&XcpTl_Connection.connectionAddress, addrSize) == SOCKET_ERROR) {
Win_ErrorMsg("XcpTl_Send:sendto()", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_Send:sendto()", WSAGetLastError());
}
} else if (XcpTl_Connection.socketType == SOCK_STREAM) {
if (send(XcpTl_Connection.connectedSocket, (char const *)buf, len, 0) == SOCKET_ERROR) {
Win_ErrorMsg("XcpTl_Send:send()", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_Send:send()", WSAGetLastError());
closesocket(XcpTl_Connection.connectedSocket);
}
}
Expand Down
30 changes: 15 additions & 15 deletions src/tl/eth/wineth_iocp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ void XcpTl_Init(void)
ZeroMemory(&Hints, sizeof(Hints));
GetSystemTimeAdjustment(&dwTimeAdjustment, &dwTimeIncrement, &fAdjustmentDisabled);
if (WSAStartup(MAKEWORD(2, 2), &wsa) != 0) {
Win_ErrorMsg("XcpTl_Init:WSAStartup()", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_Init:WSAStartup()", WSAGetLastError());
exit(EXIT_FAILURE);
} else {

Expand All @@ -203,7 +203,7 @@ void XcpTl_Init(void)
Hints.ai_flags = AI_NUMERICHOST | AI_PASSIVE;
ret = getaddrinfo(Address, Port, &Hints, &AddrInfo);
if (ret != 0) {
Win_ErrorMsg("XcpTl_Init::getaddrinfo()", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_Init::getaddrinfo()", WSAGetLastError());
WSACleanup();
return;
}
Expand All @@ -217,19 +217,19 @@ void XcpTl_Init(void)
}
serverSockets[idx] = WSASocket(AI->ai_family, AI->ai_socktype, AI->ai_protocol, NULL, 0, WSA_FLAG_OVERLAPPED);
if (serverSockets[idx] == INVALID_SOCKET){
Win_ErrorMsg("XcpTl_Init::socket()", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_Init::socket()", WSAGetLastError());
continue;
}

XcpTl_RegisterIOCPHandle(XcpTl_Connection.iocp, (HANDLE)serverSockets[idx], (ULONG_PTR)serverSockets[idx]);

if (bind(serverSockets[idx], AI->ai_addr, AI->ai_addrlen) == SOCKET_ERROR) {
Win_ErrorMsg("XcpTl_Init::bind()", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_Init::bind()", WSAGetLastError());
continue;
}
if (XcpTl_Connection.socketType == SOCK_STREAM) {
if (listen(serverSockets[idx], 1) == SOCKET_ERROR) {
Win_ErrorMsg("XcpTl_Init::listen()", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_Init::listen()", WSAGetLastError());
continue;
}
}
Expand All @@ -247,7 +247,7 @@ void XcpTl_Init(void)
exit(2);
}
if (!Xcp_EnableSocketOption(XcpTl_Connection.boundSocket, SO_REUSEADDR)) {
Win_ErrorMsg("XcpTl_Init:setsockopt(SO_REUSEADDR)", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_Init:setsockopt(SO_REUSEADDR)", WSAGetLastError());
}

setsockopt(XcpTl_Connection.boundSocket, IPPROTO_TCP, TCP_NODELAY, (const char*)&one, sizeof(one));
Expand Down Expand Up @@ -318,13 +318,13 @@ static DWORD WINAPI AcceptorThread(LPVOID lpParameter)
if (error == WSAEINTR) {
break;
} else {
Win_ErrorMsg("AcceptorThread::accept()", error);
XcpHw_ErrorMsg("AcceptorThread::accept()", error);
WSACleanup();
exit(1);
}
}
if (!Xcp_EnableSocketOption(XcpTl_Connection.connectedSocket, SO_REUSEADDR)) {
Win_ErrorMsg("AcceptorThread::setsockopt(SO_REUSEADDR)", WSAGetLastError());
XcpHw_ErrorMsg("AcceptorThread::setsockopt(SO_REUSEADDR)", WSAGetLastError());
}
setsockopt(XcpTl_Connection.boundSocket, IPPROTO_TCP, TCP_NODELAY, (const char*)&one, sizeof(one));
XcpTl_Connection.socketConnected = XCP_TRUE;
Expand Down Expand Up @@ -360,7 +360,7 @@ void XcpTl_Send(uint8_t const * buf, uint16_t len)
(LPWSAOVERLAPPED)&sendOlap.overlapped,
NULL
) == SOCKET_ERROR) {
Win_ErrorMsg("XcpTl_Send:WSASendTo()", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_Send:WSASendTo()", WSAGetLastError());
}
} else if (XcpTl_Connection.socketType == SOCK_STREAM) {
if (WSASend(
Expand All @@ -371,7 +371,7 @@ void XcpTl_Send(uint8_t const * buf, uint16_t len)
0,
(LPWSAOVERLAPPED)&sendOlap.overlapped,
NULL) == SOCKET_ERROR) {
Win_ErrorMsg("XcpTl_Send:WSASend()", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_Send:WSASend()", WSAGetLastError());
closesocket(XcpTl_Connection.connectedSocket);
}
}
Expand Down Expand Up @@ -473,7 +473,7 @@ static DWORD WINAPI WorkerThread(LPVOID lpParameter)
// Failed I/O operation.
// The function stores information in the variables pointed to by lpNumberOfBytes, lpCompletionKey.
}
Win_ErrorMsg("WorkerThread::GetQueuedCompletionStatus()", error);
XcpHw_ErrorMsg("WorkerThread::GetQueuedCompletionStatus()", error);
}
}
ExitThread(0);
Expand All @@ -485,7 +485,7 @@ static HANDLE XcpTl_CreateIOCP(void)

handle = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, (ULONG_PTR)0, 1);
if (handle == NULL) {
Win_ErrorMsg("XcpTl_CreateIOCP::CreateIoCompletionPort()", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_CreateIOCP::CreateIoCompletionPort()", WSAGetLastError());
exit(EXIT_FAILURE);
}
return handle;
Expand All @@ -498,7 +498,7 @@ static bool XcpTl_RegisterIOCPHandle(HANDLE port, HANDLE object, ULONG_PTR key)

handle = CreateIoCompletionPort(object, port, key, 0);
if (handle == NULL) {
Win_ErrorMsg("XcpTl_RegisterIOCPHandle::CreateIoCompletionPort()", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_RegisterIOCPHandle::CreateIoCompletionPort()", WSAGetLastError());
exit(EXIT_FAILURE);
}
return (bool)(handle == port);
Expand Down Expand Up @@ -532,7 +532,7 @@ static void XcpTl_TriggerRecv(DWORD numBytes)
(LPWSAOVERLAPPED_COMPLETION_ROUTINE)NULL) == SOCKET_ERROR) {
err = WSAGetLastError();
if (err != WSA_IO_PENDING) {
Win_ErrorMsg("XcpTl_TriggerRecv::WSARecv()", err);
XcpHw_ErrorMsg("XcpTl_TriggerRecv::WSARecv()", err);
}
}
} else if (XcpTl_Connection.socketType == SOCK_DGRAM) {
Expand All @@ -548,7 +548,7 @@ static void XcpTl_TriggerRecv(DWORD numBytes)
(LPWSAOVERLAPPED_COMPLETION_ROUTINE)NULL)) {
err = WSAGetLastError();
if (err != WSA_IO_PENDING) {
Win_ErrorMsg("XcpTl_TriggerRecv:WSARecvFrom()", WSAGetLastError());
XcpHw_ErrorMsg("XcpTl_TriggerRecv:WSARecvFrom()", WSAGetLastError());
}
}
}
Expand Down

0 comments on commit 745ff04

Please sign in to comment.