Merge "Revert "HAL: Add ISO packet callbacks""

diff --cc gd/hal/hci_hal_host_rootcanal.cc
Simple merge

diff --cc gd/hal/snoop_logger.cc
index ddb96be,6d5242d..5585c0d
--- 1/gd/hal/snoop_logger.cc
--- 2/gd/hal/snoop_logger.cc
+++ b/gd/hal/snoop_logger.cc
@@@ -195,36 -110,17 +195,32 @@@ void SnoopLogger::Capture(const HciPack
        flags.set(0, true);
        flags.set(1, true);
        break;
-     case PacketType::ISO:
-       flags.set(0, direction == Direction::INCOMING);
-       flags.set(1, true);
-       break;
    }
    uint32_t length = packet.size() + /* type byte */ 1;
 -  btsnoop_packet_header_t header = {.length_original = htonl(length),
 -                                    .length_captured = htonl(length),
 -                                    .flags = htonl(static_cast<uint32_t>(flags.to_ulong())),
 -                                    .dropped_packets = 0,
 -                                    .timestamp = htonll(timestamp_us + BTSNOOP_EPOCH_DELTA),
 -                                    .type = static_cast<uint8_t>(type)};
 -  btsnoop_ostream_.write(reinterpret_cast<const char*>(&header), sizeof(btsnoop_packet_header_t));
 -  btsnoop_ostream_.write(reinterpret_cast<const char*>(packet.data()), packet.size());
 -  if (AlwaysFlush) btsnoop_ostream_.flush();
 +  PacketHeaderType header = {.length_original = htonl(length),
 +                             .length_captured = htonl(length),
 +                             .flags = htonl(static_cast<uint32_t>(flags.to_ulong())),
 +                             .dropped_packets = 0,
 +                             .timestamp = htonll(timestamp_us + kBtSnoopEpochDelta),
 +                             .type = static_cast<uint8_t>(type)};
 +  {
 +    std::lock_guard<std::recursive_mutex> lock(file_mutex_);
 +    packet_counter_++;
 +    if (packet_counter_ > max_packets_per_file_) {
 +      OpenNextSnoopLogFile();
 +    }
 +    if (!btsnoop_ostream_.write(reinterpret_cast<const char*>(&header), sizeof(PacketHeaderType))) {
 +      LOG_ERROR("Failed to write packet header, error: \"%s\"", strerror(errno));
 +    }
 +    if (!btsnoop_ostream_.write(reinterpret_cast<const char*>(packet.data()), packet.size())) {
 +      LOG_ERROR("Failed to write packet payload, error: \"%s\"", strerror(errno));
 +    }
 +    if (os::ParameterProvider::SnoopLogAlwaysFlush()) {
 +      if (!btsnoop_ostream_.flush()) {
 +        LOG_ERROR("Failed to flush, error: \"%s\"", strerror(errno));
 +      }
 +    }
 +  }
  }
  
  void SnoopLogger::ListDependencies(ModuleList* list) {

diff --cc gd/hal/snoop_logger.h
index 06f93d8,8021c2b..6ff5ebb
--- 1/gd/hal/snoop_logger.h
--- 2/gd/hal/snoop_logger.h
+++ b/gd/hal/snoop_logger.h
@@@ -77,10 -43,9 +77,9 @@@ class SnoopLogger : public ::bluetooth:
      ACL = 2,
      SCO = 3,
      EVT = 4,
-     ISO = 5,
    };
  
 -  enum class Direction {
 +  enum Direction {
      INCOMING,
      OUTGOING,
    };