Remove redundant macros. Saves 32 bytes of memory

Author: gudnimg

src/Dhcp.cpp

@@ -134,15 +134,15 @@ void DhcpClass::send_DHCP_MESSAGE(uint8_t messageType, uint16_t secondsElapsed)
 	buffer[3] = DHCP_HOPS;          // hops
 
 	// xid
-	unsigned long xid = htonl(_dhcpTransactionId);
+	unsigned long xid = _dhcpTransactionId;
 	memcpy(buffer + 4, &(xid), 4);
 
 	// 8, 9 - seconds elapsed
 	buffer[8] = ((secondsElapsed & 0xff00) >> 8);
 	buffer[9] = (secondsElapsed & 0x00ff);
 
 	// flags
-	unsigned short flags = htons(DHCP_FLAGSBROADCAST);
+	unsigned short flags = DHCP_FLAGSBROADCAST;
 	memcpy(buffer + 10, &(flags), 2);
 
 	// ciaddr: already zeroed
@@ -251,7 +251,7 @@ uint8_t DhcpClass::parseDHCPResponse(unsigned long responseTimeout, uint32_t& tr
 	_dhcpUdpSocket.read((uint8_t*)&fixedMsg, sizeof(RIP_MSG_FIXED));
 
 	if (fixedMsg.op == DHCP_BOOTREPLY && _dhcpUdpSocket.remotePort() == DHCP_SERVER_PORT) {
-		transactionId = ntohl(fixedMsg.xid);
+		transactionId = fixedMsg.xid;
 		if (memcmp(fixedMsg.chaddr, _dhcpMacAddr, 6) != 0 ||
 		  (transactionId < _dhcpInitialTransactionId) ||
 		  (transactionId > _dhcpTransactionId)) {
@@ -309,19 +309,19 @@ uint8_t DhcpClass::parseDHCPResponse(unsigned long responseTimeout, uint32_t& tr
 			case dhcpT1value :
 				opt_len = _dhcpUdpSocket.read();
 				_dhcpUdpSocket.read((uint8_t*)&_dhcpT1, sizeof(_dhcpT1));
-				_dhcpT1 = ntohl(_dhcpT1);
+				_dhcpT1 = _dhcpT1;
 				break;
 
 			case dhcpT2value :
 				opt_len = _dhcpUdpSocket.read();
 				_dhcpUdpSocket.read((uint8_t*)&_dhcpT2, sizeof(_dhcpT2));
-				_dhcpT2 = ntohl(_dhcpT2);
+				_dhcpT2 = _dhcpT2;
 				break;
 
 			case dhcpIPaddrLeaseTime :
 				opt_len = _dhcpUdpSocket.read();
 				_dhcpUdpSocket.read((uint8_t*)&_dhcpLeaseTime, sizeof(_dhcpLeaseTime));
-				_dhcpLeaseTime = ntohl(_dhcpLeaseTime);
+				_dhcpLeaseTime = _dhcpLeaseTime;
 				_renewInSec = _dhcpLeaseTime;
 				break;
 

src/Dns.cpp

@@ -161,10 +161,10 @@ uint16_t DNSClient::BuildRequest(const char* aName)
 	// FIXME than assume there's enough space (as the code does at present)
 	iUdp.write((uint8_t*)&iRequestId, sizeof(iRequestId));
 
-	twoByteBuffer = htons(QUERY_FLAG | OPCODE_STANDARD_QUERY | RECURSION_DESIRED_FLAG);
+	twoByteBuffer = QUERY_FLAG | OPCODE_STANDARD_QUERY | RECURSION_DESIRED_FLAG;
 	iUdp.write((uint8_t*)&twoByteBuffer, sizeof(twoByteBuffer));
 
-	twoByteBuffer = htons(1);  // One question record
+	twoByteBuffer = 1;  // One question record
 	iUdp.write((uint8_t*)&twoByteBuffer, sizeof(twoByteBuffer));
 
 	twoByteBuffer = 0;  // Zero answer records
@@ -201,10 +201,10 @@ uint16_t DNSClient::BuildRequest(const char* aName)
 	len = 0;
 	iUdp.write(&len, sizeof(len));
 	// Finally the type and class of question
-	twoByteBuffer = htons(TYPE_A);
+	twoByteBuffer = TYPE_A;
 	iUdp.write((uint8_t*)&twoByteBuffer, sizeof(twoByteBuffer));
 
-	twoByteBuffer = htons(CLASS_IN);  // Internet class of question
+	twoByteBuffer = CLASS_IN;  // Internet class of question
 	iUdp.write((uint8_t*)&twoByteBuffer, sizeof(twoByteBuffer));
 	// Success!  Everything buffered okay
 	return 1;
@@ -243,7 +243,7 @@ uint16_t DNSClient::ProcessResponse(uint16_t aTimeout, IPAddress& aAddress)
 	}
 	iUdp.read(header.byte, DNS_HEADER_SIZE);
 
-	uint16_t header_flags = htons(header.word[1]);
+	uint16_t header_flags = header.word[1];
 	// Check that it's a response to this request
 	if ((iRequestId != (header.word[0])) ||
 	  ((header_flags & QUERY_RESPONSE_MASK) != (uint16_t)RESPONSE_FLAG) ) {
@@ -260,15 +260,15 @@ uint16_t DNSClient::ProcessResponse(uint16_t aTimeout, IPAddress& aAddress)
 	}
 
 	// And make sure we've got (at least) one answer
-	uint16_t answerCount = htons(header.word[3]);
+	uint16_t answerCount = header.word[3];
 	if (answerCount == 0) {
 		// Mark the entire packet as read
 		iUdp.flush(); // FIXME
 		return -6; //INVALID_RESPONSE;
 	}
 
 	// Skip over any questions
-	for (uint16_t i=0; i < htons(header.word[2]); i++) {
+	for (uint16_t i=0; i < header.word[2]; i++) {
 		// Skip over the name
 		uint8_t len;
 		do {
@@ -329,8 +329,8 @@ uint16_t DNSClient::ProcessResponse(uint16_t aTimeout, IPAddress& aAddress)
 		// Don't need header_flags anymore, so we can reuse it here
 		iUdp.read((uint8_t*)&header_flags, sizeof(header_flags));
 
-		if ( (htons(answerType) == TYPE_A) && (htons(answerClass) == CLASS_IN) ) {
-			if (htons(header_flags) != 4) {
+		if ( (answerType == TYPE_A) && (answerClass == CLASS_IN) ) {
+			if (header_flags != 4) {
 				// It's a weird size
 				// Mark the entire packet as read
 				iUdp.flush(); // FIXME
@@ -341,7 +341,7 @@ uint16_t DNSClient::ProcessResponse(uint16_t aTimeout, IPAddress& aAddress)
 			return SUCCESS;
 		} else {
 			// This isn't an answer type we're after, move onto the next one
-			iUdp.read((uint8_t *)NULL, htons(header_flags));
+			iUdp.read((uint8_t *)NULL, header_flags);
 		}
 	}
 

src/utility/w5100.h

@@ -447,24 +447,4 @@ class W5100Class {
 
 extern W5100Class W5100;
 
-
-
-#endif
-
-#ifndef UTIL_H
-#define UTIL_H
-
-#ifndef htons
-
-#define htons(x) ( (((x)<<8)&0xFF00) | (((x)>>8)&0xFF) )
-#define ntohs(x) htons(x)
-
-#define htonl(x) ( ((x)<<24 & 0xFF000000UL) | \
-                   ((x)<< 8 & 0x00FF0000UL) | \
-                   ((x)>> 8 & 0x0000FF00UL) | \
-                   ((x)>>24 & 0x000000FFUL) )
-#define ntohl(x) htonl(x)
-
-#endif // !defined(htons)
-
 #endif