Restructure firmware_image so that the firmware image checksum gets check before reading from the
device. Also, merge the extract header and initialize functions.
diff --git a/rmi4update/rmi4update.cpp b/rmi4update/rmi4update.cpp
index 3982080..9f3d860 100644
--- a/rmi4update/rmi4update.cpp
+++ b/rmi4update/rmi4update.cpp
@@ -107,7 +107,7 @@
 	if (rc != UPDATE_SUCCESS)
 		return rc;
 
-	rc = m_firmwareImage.VerifyImage(GetFirmwareSize(), GetConfigSize());
+	rc = m_firmwareImage.VerifyImageMatchesDevice(GetFirmwareSize(), GetConfigSize());
 	if (rc != UPDATE_SUCCESS)
 		return rc;
 
@@ -481,4 +481,4 @@
 	fprintf(stderr, "Idle:    %d\n", !m_f34Command && !m_f34Status);
 
 	return UPDATE_FAIL_NOT_IN_IDLE_STATE;
-}
\ No newline at end of file
+}