Compare commits
25 Commits
size_check
...
master
Author | SHA1 | Date |
---|---|---|
Henrik Grimler | 02b577ec77 | |
Henrik Grimler | 14f3521a6b | |
Henrik Grimler | 0cf817a591 | |
Henrik Grimler | c3516307d2 | |
Henrik Grimler | f6c4698c8b | |
Henrik Grimler | d81e0f5bc2 | |
Henrik Grimler | 62368adc7d | |
Henrik Grimler | 0f1843c93c | |
Henrik Grimler | 172ab65cbe | |
Henrik Grimler | 1e7ff3b659 | |
Henrik Grimler | e916c679ed | |
Henrik Grimler | e9a68f6862 | |
Henrik Grimler | 990ce68f5c | |
Antony Cherepanov | c939ab18d1 | |
Antony Cherepanov | 1385b183d2 | |
Henrik Grimler | 95e5c1cdcb | |
Henrik Grimler | 622067f284 | |
Henrik Grimler | 9b0e9ff174 | |
Henrik Grimler | 225164f87e | |
Henrik Grimler | 91802883a0 | |
Henrik Grimler | 40be58b43e | |
Henrik Grimler | 60ab9bbaff | |
Henrik Grimler | e51c9119f1 | |
Henrik Grimler | 31745c287a | |
Henrik Grimler | cedfcd8c80 |
17
README.md
17
README.md
|
@ -1,5 +1,9 @@
|
|||
# Heimdall
|
||||
|
||||
[![builds.sr.ht status](https://builds.sr.ht/~grimler/Heimdall/commits/ubuntu.yml.svg)](https://builds.sr.ht/~grimler/Heimdall/commits/ubuntu.yml?)
|
||||
[![builds.sr.ht status](https://builds.sr.ht/~grimler/Heimdall/commits/archlinux.yml.svg)](https://builds.sr.ht/~grimler/Heimdall/commits/archlinux.yml?)
|
||||
[![builds.sr.ht status](https://builds.sr.ht/~grimler/Heimdall/commits/alpine.yml.svg)](https://builds.sr.ht/~grimler/Heimdall/commits/alpine.yml?)
|
||||
|
||||
Heimdall is a cross-platform open-source tool suite used to flash
|
||||
firmware (aka ROMs) onto Samsung mobile devices.
|
||||
|
||||
|
@ -20,7 +24,7 @@ Heimdall communicate via the custom Samsung-developed protocol
|
|||
typically referred to as the 'Odin 3 protocol'.
|
||||
|
||||
USB communication in Heimdall is handled by the popular open-source
|
||||
USB library, [libusb](http://libusb.info).
|
||||
USB library, [libusb](https://libusb.info).
|
||||
|
||||
## Free & Open Source
|
||||
|
||||
|
@ -40,12 +44,17 @@ refer to the appropriate platform specific README:
|
|||
|
||||
#### Linux
|
||||
|
||||
- Linux/README ([online](https://raw.githubusercontent.com/Benjamin-Dobell/Heimdall/master/Linux/README))
|
||||
- Linux/README ([online](Linux/README))
|
||||
|
||||
#### OS X
|
||||
|
||||
- OSX/README.txt ([online](https://raw.githubusercontent.com/Benjamin-Dobell/Heimdall/master/OSX/README.txt))
|
||||
- OSX/README.txt ([online](OSX/README.txt))
|
||||
|
||||
#### Windows
|
||||
|
||||
- Win32/README.txt ([online](https://raw.githubusercontent.com/Benjamin-Dobell/Heimdall/master/Win32/README.txt))
|
||||
- Win32/README.txt ([online](Win32/README.txt))
|
||||
|
||||
### Odin protocol and PIT format
|
||||
|
||||
For more details on the Odin protocol, and the PIT files, see the
|
||||
external project [samsung-loki/samsung-docs](https://samsung-loki.github.io/samsung-docs/).
|
||||
|
|
Binary file not shown.
|
@ -20,7 +20,7 @@ Driver Installation Instructions:
|
|||
|
||||
1. Put your device into download mode and plug it in.
|
||||
|
||||
2. Run zadig.exe included in the Drivers subdirectory.
|
||||
2. Download zadig from https://zadig.akeo.ie/downloads/, and run zadig.exe.
|
||||
|
||||
3. From the menu chose Options -> List All Devices.
|
||||
|
||||
|
|
|
@ -114,7 +114,7 @@
|
|||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Heimdall Frontend</span></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Version 1.4.2</p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Version 2.0.2</p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Copyright © 2010-2017 Benjamin Dobell, Glass Echidna</p>
|
||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Heimdall (command line)</span></p>
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
|
||||
// C Standard Library
|
||||
#include <cstdio>
|
||||
#include <fstream>
|
||||
|
||||
// libusb
|
||||
#include <libusb.h>
|
||||
|
@ -80,16 +81,17 @@ int BridgeManager::FindDeviceInterface(void)
|
|||
Interface::Print("Detecting device...\n");
|
||||
|
||||
struct libusb_device **devices;
|
||||
int deviceCount = libusb_get_device_list(libusbContext, &devices);
|
||||
unsigned int deviceCount = libusb_get_device_list(libusbContext, &devices);
|
||||
|
||||
for (int deviceIndex = 0; deviceIndex < deviceCount; deviceIndex++)
|
||||
for (unsigned int deviceIndex = 0; deviceIndex < deviceCount; deviceIndex++)
|
||||
{
|
||||
libusb_device_descriptor descriptor;
|
||||
libusb_get_device_descriptor(devices[deviceIndex], &descriptor);
|
||||
|
||||
for (int i = 0; i < BridgeManager::kSupportedDeviceCount; i++)
|
||||
{
|
||||
if (descriptor.idVendor == supportedDevices[i].vendorId && descriptor.idProduct == supportedDevices[i].productId)
|
||||
if (descriptor.idVendor == supportedDevices[i].vendorId &&
|
||||
descriptor.idProduct == supportedDevices[i].productId)
|
||||
{
|
||||
heimdallDevice = devices[deviceIndex];
|
||||
libusb_ref_device(heimdallDevice);
|
||||
|
@ -310,14 +312,20 @@ bool BridgeManager::InitialiseProtocol(void)
|
|||
memcpy(dataBuffer, "ODIN", 4);
|
||||
memset(dataBuffer + 4, 0, 1);
|
||||
|
||||
if (libusb_reset_device(deviceHandle))
|
||||
#ifdef OS_LINUX
|
||||
if (IsUbuntu())
|
||||
{
|
||||
Interface::PrintError("Failed to reset device!");
|
||||
Interface::Print("Resetting device...\n");
|
||||
if (libusb_reset_device(deviceHandle))
|
||||
{
|
||||
Interface::PrintError("Failed to reset device!\n");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
if (!SendBulkTransfer(dataBuffer, 4, 1000))
|
||||
{
|
||||
Interface::PrintError("Failed to send handshake!");
|
||||
Interface::PrintError("Failed to send handshake!\n");
|
||||
}
|
||||
|
||||
// Expect "LOKE"
|
||||
|
@ -407,29 +415,8 @@ bool BridgeManager::DetectDevice(void)
|
|||
return (false);
|
||||
}
|
||||
|
||||
// Setup libusb log level.
|
||||
switch (usbLogLevel)
|
||||
{
|
||||
case UsbLogLevel::None:
|
||||
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_NONE);
|
||||
break;
|
||||
|
||||
case UsbLogLevel::Error:
|
||||
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_ERROR);
|
||||
break;
|
||||
|
||||
case UsbLogLevel::Warning:
|
||||
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_WARNING);
|
||||
break;
|
||||
|
||||
case UsbLogLevel::Info:
|
||||
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_INFO);
|
||||
break;
|
||||
|
||||
case UsbLogLevel::Debug:
|
||||
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_DEBUG);
|
||||
break;
|
||||
}
|
||||
// Set libusb log level.
|
||||
SetUsbLogLevel(usbLogLevel);
|
||||
|
||||
// Get handle to Galaxy S device
|
||||
struct libusb_device **devices;
|
||||
|
@ -442,7 +429,8 @@ bool BridgeManager::DetectDevice(void)
|
|||
|
||||
for (int i = 0; i < BridgeManager::kSupportedDeviceCount; i++)
|
||||
{
|
||||
if (descriptor.idVendor == supportedDevices[i].vendorId && descriptor.idProduct == supportedDevices[i].productId)
|
||||
if (descriptor.idVendor == supportedDevices[i].vendorId &&
|
||||
descriptor.idProduct == supportedDevices[i].productId)
|
||||
{
|
||||
libusb_free_device_list(devices, deviceCount);
|
||||
|
||||
|
@ -468,34 +456,13 @@ int BridgeManager::Initialise(bool resume)
|
|||
if (result != LIBUSB_SUCCESS)
|
||||
{
|
||||
Interface::PrintError("Failed to initialise libusb. libusb error: %d\n", result);
|
||||
Interface::Print("Failed to connect to device!");
|
||||
Interface::Print("Failed to connect to device!\n");
|
||||
return (BridgeManager::kInitialiseFailed);
|
||||
}
|
||||
|
||||
// Setup libusb log level.
|
||||
switch (usbLogLevel)
|
||||
{
|
||||
case UsbLogLevel::None:
|
||||
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_NONE);
|
||||
break;
|
||||
SetUsbLogLevel(usbLogLevel);
|
||||
|
||||
case UsbLogLevel::Error:
|
||||
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_ERROR);
|
||||
break;
|
||||
|
||||
case UsbLogLevel::Warning:
|
||||
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_WARNING);
|
||||
break;
|
||||
|
||||
case UsbLogLevel::Info:
|
||||
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_INFO);
|
||||
break;
|
||||
|
||||
case UsbLogLevel::Debug:
|
||||
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_DEBUG);
|
||||
break;
|
||||
}
|
||||
|
||||
result = FindDeviceInterface();
|
||||
|
||||
if (result != BridgeManager::kInitialiseSucceeded)
|
||||
|
@ -749,7 +716,7 @@ bool BridgeManager::ReceivePacket(InboundPacket *packet, int timeout, int emptyT
|
|||
if (receivedSize < 0)
|
||||
return (false);
|
||||
|
||||
if (receivedSize != packet->GetSize() && !packet->IsSizeVariable())
|
||||
if (static_cast<unsigned int>(receivedSize) != packet->GetSize() && !packet->IsSizeVariable())
|
||||
{
|
||||
if (verbose)
|
||||
Interface::PrintError("Incorrect packet size received - expected size = %d, received size = %d.\n", packet->GetSize(), receivedSize);
|
||||
|
@ -949,7 +916,7 @@ int BridgeManager::ReceivePitFile(unsigned char **pitBuffer) const
|
|||
}
|
||||
|
||||
int receiveEmptyTransferFlags = (i == transferCount - 1) ? kEmptyTransferAfter : kEmptyTransferNone;
|
||||
|
||||
|
||||
ReceiveFilePartPacket *receiveFilePartPacket = new ReceiveFilePartPacket();
|
||||
success = ReceivePacket(receiveFilePartPacket, kDefaultTimeoutReceive, receiveEmptyTransferFlags);
|
||||
|
||||
|
@ -1277,3 +1244,32 @@ void BridgeManager::SetUsbLogLevel(UsbLogLevel usbLogLevel)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef OS_LINUX
|
||||
bool BridgeManager::IsUbuntu()
|
||||
{
|
||||
std::ifstream os_release("/etc/os-release");
|
||||
std::string line, entry, os;
|
||||
int pos;
|
||||
while (std::getline(os_release, line))
|
||||
{
|
||||
pos = line.find("=");
|
||||
entry = line.substr(0, pos);
|
||||
if (entry == "ID")
|
||||
{
|
||||
os = line.substr(pos+1);
|
||||
if (verbose)
|
||||
{
|
||||
Interface::Print("Linux distro ID: %s\n",
|
||||
os.c_str());
|
||||
}
|
||||
if (os == "ubuntu")
|
||||
{
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -166,7 +166,9 @@ namespace Heimdall
|
|||
bool SendFile(FILE *file, unsigned int destination, unsigned int deviceType, unsigned int fileIdentifier = 0xFFFFFFFF) const;
|
||||
|
||||
void SetUsbLogLevel(UsbLogLevel usbLogLevel);
|
||||
|
||||
#ifdef OS_LINUX
|
||||
bool IsUbuntu(void);
|
||||
#endif
|
||||
UsbLogLevel GetUsbLogLevel(void) const
|
||||
{
|
||||
return usbLogLevel;
|
||||
|
|
|
@ -148,7 +148,7 @@ int DownloadPitAction::Execute(int argc, char **argv)
|
|||
|
||||
if (fileSize > 0)
|
||||
{
|
||||
if (fwrite(pitBuffer, 1, fileSize, outputPitFile) != fileSize)
|
||||
if (fwrite(pitBuffer, 1, fileSize, outputPitFile) != static_cast<size_t>(fileSize))
|
||||
{
|
||||
Interface::PrintError("Failed to write PIT data to output file.\n");
|
||||
success = false;
|
||||
|
|
|
@ -116,16 +116,16 @@ static bool openFiles(Arguments& arguments, vector<PartitionFile>& partitionFile
|
|||
{
|
||||
const StringArgument *stringArgument = static_cast<const StringArgument *>(*it);
|
||||
FILE *file = FileOpen(stringArgument->GetValue().c_str(), "rb");
|
||||
FileSeek(file, 0, SEEK_END);
|
||||
unsigned long fileSize = (unsigned long)FileTell(file);
|
||||
FileRewind(file);
|
||||
|
||||
if (!file)
|
||||
{
|
||||
Interface::PrintError("Failed to open file \"%s\"\n", stringArgument->GetValue().c_str());
|
||||
return (false);
|
||||
}
|
||||
|
||||
FileSeek(file, 0, SEEK_END);
|
||||
unsigned long fileSize = (unsigned long)FileTell(file);
|
||||
FileRewind(file);
|
||||
|
||||
partitionFiles.push_back(PartitionFile(argumentName.c_str(), file, fileSize));
|
||||
}
|
||||
}
|
||||
|
@ -303,16 +303,15 @@ static bool flashPartitions(BridgeManager *bridgeManager, const vector<Partition
|
|||
{
|
||||
const PitEntry *part = pitData->FindEntry(it->argumentName);
|
||||
if (part->GetDeviceType() != PitEntry::kDeviceTypeMMC &&
|
||||
part->GetDeviceType() != PitEntry::kDeviceTypeMMC4096)
|
||||
part->GetDeviceType() != PitEntry::kDeviceTypeUFS)
|
||||
continue;
|
||||
unsigned long partitionSize = part->GetBlockCount();
|
||||
unsigned int blockSize = 512;
|
||||
if (part->GetDeviceType() == PitEntry::kDeviceTypeMMC4096)
|
||||
if (part->GetDeviceType() == PitEntry::kDeviceTypeUFS)
|
||||
blockSize = 4096;
|
||||
printf("Partition %s: size %lu, size in PIT: %lu\n", it->argumentName, it->fileSize, partitionSize*blockSize);
|
||||
if (partitionSize > 0 && it->fileSize > partitionSize*blockSize)
|
||||
{
|
||||
Interface::PrintError("%s partition is too small for specified file\n",
|
||||
Interface::PrintError("%s partition is too small for given file. Use --skip-size-check to flash anyways.\n",
|
||||
it->argumentName);
|
||||
return (false);
|
||||
}
|
||||
|
|
|
@ -42,7 +42,7 @@ using namespace Heimdall;
|
|||
map<string, Interface::ActionInfo> actionMap;
|
||||
bool stdoutErrors = false;
|
||||
|
||||
const char *version = "v1.4.2";
|
||||
const char *version = "v2.0.2";
|
||||
const char *actionUsage = "Usage: heimdall <action> <action arguments>\n";
|
||||
|
||||
const char *releaseInfo = "Heimdall %s\n\n\
|
||||
|
@ -211,7 +211,7 @@ void Interface::PrintPit(const PitData *pitData)
|
|||
Interface::Print("Entry Count: %d\n", pitData->GetEntryCount());
|
||||
Interface::Print("Unknown string: %s\n", pitData->GetComTar2());
|
||||
Interface::Print("CPU/bootloader tag: %s\n", pitData->GetCpuBlId());
|
||||
Interface::Print("Unknown: 0x%04x\n", pitData->GetUnknown());
|
||||
Interface::Print("Logic unit count: %d\n", pitData->GetLUCount());
|
||||
|
||||
for (unsigned int i = 0; i < pitData->GetEntryCount(); i++)
|
||||
{
|
||||
|
@ -257,8 +257,8 @@ void Interface::PrintPit(const PitData *pitData)
|
|||
Interface::Print("All (?)");
|
||||
break;
|
||||
|
||||
case PitEntry::kDeviceTypeMMC4096:
|
||||
Interface::Print("MMC 4096");
|
||||
case PitEntry::kDeviceTypeUFS:
|
||||
Interface::Print("UFS");
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
|
@ -45,7 +45,7 @@ namespace Heimdall
|
|||
memset(data, 0, size);
|
||||
}
|
||||
|
||||
~Packet()
|
||||
virtual ~Packet()
|
||||
{
|
||||
delete [] data;
|
||||
}
|
||||
|
|
|
@ -69,7 +69,7 @@ PitData::PitData()
|
|||
com_tar2[0] = '\0';
|
||||
cpu_bl_id[0] = '\0';
|
||||
|
||||
unknown = 0;
|
||||
luCount = 0;
|
||||
}
|
||||
|
||||
PitData::~PitData()
|
||||
|
@ -98,7 +98,7 @@ bool PitData::Unpack(const unsigned char *data)
|
|||
return (false);
|
||||
cpu_bl_id[8]='\0';
|
||||
|
||||
unknown = PitData::UnpackShort(data, 24);
|
||||
luCount = PitData::UnpackShort(data, 24);
|
||||
|
||||
unsigned int integerValue;
|
||||
unsigned int entryOffset;
|
||||
|
@ -153,7 +153,7 @@ void PitData::Pack(unsigned char *data) const
|
|||
memcpy(&data[8], com_tar2, 8);
|
||||
memcpy(&data[16], cpu_bl_id, 8);
|
||||
|
||||
PitData::PackShort(data, 24, unknown);
|
||||
PitData::PackShort(data, 24, luCount);
|
||||
|
||||
int entryOffset;
|
||||
|
||||
|
@ -187,7 +187,7 @@ bool PitData::Matches(const PitData *otherPitData) const
|
|||
if (entryCount == otherPitData->entryCount &&
|
||||
(strncmp(com_tar2, otherPitData->com_tar2, 8) == 0) &&
|
||||
(strncmp(cpu_bl_id, otherPitData->cpu_bl_id, 8) == 0) &&
|
||||
unknown == otherPitData->unknown)
|
||||
luCount == otherPitData->luCount)
|
||||
{
|
||||
for (unsigned int i = 0; i < entryCount; i++)
|
||||
{
|
||||
|
@ -211,7 +211,7 @@ void PitData::Clear(void)
|
|||
|
||||
cpu_bl_id[0] = '\0';
|
||||
|
||||
unknown = 0;
|
||||
luCount = 0;
|
||||
|
||||
for (unsigned int i = 0; i < entries.size(); i++)
|
||||
delete entries[i];
|
||||
|
|
|
@ -62,7 +62,7 @@ namespace libpit
|
|||
kDeviceTypeFile, // FAT
|
||||
kDeviceTypeMMC,
|
||||
kDeviceTypeAll, // ?
|
||||
kDeviceTypeMMC4096 = 8 // block size 4096
|
||||
kDeviceTypeUFS = 8
|
||||
};
|
||||
|
||||
enum
|
||||
|
@ -266,7 +266,7 @@ namespace libpit
|
|||
|
||||
char cpu_bl_id[8+1]; // 0x10
|
||||
|
||||
unsigned short unknown; // 0x18
|
||||
unsigned short luCount; // 0x18
|
||||
|
||||
// Entries start at 0x1C
|
||||
std::vector<PitEntry *> entries;
|
||||
|
@ -375,9 +375,9 @@ namespace libpit
|
|||
return cpu_bl_id;
|
||||
}
|
||||
|
||||
unsigned int GetUnknown(void) const
|
||||
unsigned int GetLUCount(void) const
|
||||
{
|
||||
return unknown;
|
||||
return luCount;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue